Message ID | 201704281216.v3SCGEYe016243@finist_cl7.x64_64.work.ct |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Fri, 28 Apr 2017 14:19:18 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp239326pjb; Fri, 28 Apr 2017 05:19:13 -0700 (PDT) X-Received: by 10.84.169.67 with SMTP id g61mr9031249plb.81.1493381953390; Fri, 28 Apr 2017 05:19:13 -0700 (PDT) Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [195.214.232.140]) by mx.google.com with ESMTPS id d27si6547926plj.132.2017.04.28.05.19.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Apr 2017 05:19:13 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3SCGeEA000626; Fri, 28 Apr 2017 05:16:46 -0700 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp0210.outbound.protection.outlook.com [213.199.154.210]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3SCGd2n000618 for <devel@openvz.org>; Fri, 28 Apr 2017 05:16:39 -0700 Received: from DB6PR0801CA0046.eurprd08.prod.outlook.com (10.169.219.14) by VI1PR08MB0429.eurprd08.prod.outlook.com (10.162.12.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Fri, 28 Apr 2017 12:16:18 +0000 Received: from DB5EUR01FT058.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e02::202) by DB6PR0801CA0046.outlook.office365.com (2603:10a6:4:2b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12 via Frontend Transport; Fri, 28 Apr 2017 12:16:18 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.25) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 195.214.232.25 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.25; helo=relay.sw.ru; Received: from relay.sw.ru (195.214.232.25) by DB5EUR01FT058.mail.protection.outlook.com (10.152.5.46) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1047.9 via Frontend Transport; Fri, 28 Apr 2017 12:16:15 +0000 Received: from finist_cl7.x64_64.work.ct (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v3SCGEFt013885 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 28 Apr 2017 15:16:14 +0300 (MSK) Received: from finist_cl7.x64_64.work.ct (localhost [127.0.0.1]) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7) with ESMTP id v3SCGEVt016244; Fri, 28 Apr 2017 16:16:14 +0400 Received: (from khorenko@localhost) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7/Submit) id v3SCGEYe016243; Fri, 28 Apr 2017 16:16:14 +0400 Date: Fri, 28 Apr 2017 16:16:14 +0400 Message-ID: <201704281216.v3SCGEYe016243@finist_cl7.x64_64.work.ct> X-Authentication-Warning: finist_cl7.x64_64.work.ct: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Andrey Ryabinin <aryabinin@virtuozzo.com> In-Reply-To: <20170427080027.1282-1-aryabinin@virtuozzo.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.25; IPV:CAL; SCL:-1; CTRY:RU; EFV:NLI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR08MB0429; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR01FT058; 1:Nzq4fCYUrZiJp1mCqh/u/l8k0KDSO9IdP95XZPAOsnZR00ZxuH6OFfVod2sHEtQHvoCzx4vjPDN69WY3/PFEtGOHHc3TH4q/FbSi0UrxhP0ZuodVUAp2cIpqmjjxoskr8rKvOGTntBQ0P7RBzZvxZgj5l4fPBno/HdnXx5mV6E9rc0Sv8jTRCdJN+t/x/Nk264gACpY+Sv/apnu6wnuLsIl7D4253j+XqIfwRbEGtKLXJoIOP32x5n++PKicbyb8blPjy6RU4xStYtU0i7IV1zTMLYejfgBixwqmLP47DckaMwwqlvTre5a/gkm1U3cgFUJex68HdbHl/xOvf3LBjdj9g1V3MrYeuq6XYaUNHgpS5YHZW3/mTB+RQQ3Wo5VDSWJeBPyR3kzzocJiN6JygWxUTjTZysnyJnTqgVw3RhQD2KLL8ex2X/KDhkIlC+3MRzmeHhoXvu5Qxr+fKsXJ1qMw6tObpsxLqOeilXPCIigv/i0LtboGj0REby7M9vOXGPkBfg23qLjbPCOraVOznA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ffdfe225-89d5-4d1b-b673-08d48e305ea9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:VI1PR08MB0429; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0429; 3:ErA+7+Vd8fDqouePOV2kbtljBzbRJwKCJEqouznmJGnIxRcmqP8gcz//l3CPf8Lybpa/5m7O8rQ0pQdbzK53sQ3bkwt+esLBOgqXe4leeRjXTdqf7tshovZVwqfMKVQj5iNLpsmQY3FiE3Y3d0aVxmBjabfj6wKh1p+YsQVJMAGr1hAJcAZUB87CrOddSQ7Wh1HPqDVQs9t/7XyUHKNVw9w5CgSIawu7YoZPeABRy1fx5WOcJ8xbNEQlbcCSLLRTqF5OlmaAEyfPpxVh4vDvp2nyUCR1o1WCChCouquzYu7UUtga/KLfasHo9GXwfmbt+PfqSFbi9PxwlQesWZVNOYxZQuo2xk62+wkkO7WFsEUELcWSC6tNfaFc5/T2oFwEbMtV3rgXjGxKAJqVyqi9gX0/epSstmc40uDPLDr5ppVjEIo0HyeMVGeXWfMSGuTha16xUJb+JG+7UgWNji6K4ZvISOApBglfJdBvhiCzZHoDm3niJsLfgfnDU5R1zhtSLY3iPDh7V4stc4ArOKgF+w== X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0429; 25:jpoUiVK1XVJ0Klcg843eOfgog/trO0o/wOaTGdIKBIWgHdfPWyx/psD6EBfxl/ks3ZAkDE7pCoTQhyDZ9Oog/gpz9AKYMWLY03KdqgwA/C2N2CH1RBXeUpO6g5MR/chOs/yx+5ZnoNVdKkSmaM7CQBD7ZCET3tlkU7BfCkbVV4+8msvWKBf9yIgoW9G0VygvAjRhFQ9q4dJh9SKgykIxSZ4xDOOpGWkSVrCwJfOaZaNrYKLLsm3SLNSkFliUEOtqYxW/ojzMTXkZTkqKhEwDeFMP4CBRULCvovsu3heyf3UT9p8UIJJvNMcd86k/hUg4WPkAdiTxGEQRIr+1Bs7HnmS+8xVaufyqJL0HPdJBTgeSSAkWADGbcxUkHyQyIqUEi3sXPVSOVhqvI+eUjQCdwk48JQOBplwLedp76Zto1mR67HcDgfwLj0TFOd5nW7GI9ooHOdb1N9mmfJDJPy+oVw==; 31:dEKmSLcSzsnp84w33okRYiJMWDmFG+3G7H6MEprhVXjzaE+RPZIIZnWYZcK9GealHiRIhnUfBlTgAh2IVAQWfxQ0upa5vx5mD8PY/pLi/+cvJrr6Oehpc+YrYd8UX5ZNy31a9ZfwAwiEAvSAIGRPaglI+M1vJhaw7e5tpbSOn6v8Or9vBfiNzsaBShKlIfhF8Bk5UpTjljQ6DNArnKsDuGbW25tXyP1nkLI8xgBCjPEHK6/2aZBxH/tU5zQSwXg414/2H58rtzQ/aIdD+1C29rANxN0mV1BESInfgie3gvw9URzYtWlQtYq6ATtGLHeM X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0429; 20:RGK7yKc3AV3rDVasePFMJTl960jKbYCsBrlC7SKlv3nF0UICNx7osw+P1X8UVghJ3ZTyg3py2Vf1wJ96uN1v1zBCDVKd5wTTCdiIat2YrpFRZuFORCLOeoqKBXCZisxq3DcrugrGVm037PS6TBjXFuTKLs+f8M9tKR2LlaYjhBhXjD20kqXV1f67FUU3Lpw1QWf/G0wpvKxUW40e33KzIi2lXdj8YI7qX0N+hCDERgQifhZzyxTmXMFWMX4VCLSxBuAiJkDvk3B2aZpgrXVYhG/VtUo+owNq05UW8VAMgjIpbdD8SmtdrnX25cp2aGaos94KEMbIe8Y2AyImTaJdc92Ba5FB5hfTQU+BW4OqlQIwI0PCdTp8YkW4B6YQ8DgJzks7ZTZNu2su06VQ0StWbryxepV4WuyQIq/sroVoNgELnt5OsKjc5nOx0NS8YPXTaL3dvpNtf6Xk7mIsVj3E0oK2CH8Kg9Tv5jhcpNhNs3fwO6F+XdudLe6usos60cldpStCjv3h0caDNwu7b0AquA== X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521199)(601004)(2401047)(13020025)(13023025)(13013025)(8121501046)(3002001)(93006095)(93004095)(10201501046); SRVR:VI1PR08MB0429; BCL:0; PCL:0; RULEID:; SRVR:VI1PR08MB0429; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0429; 4:VCFj6/Uzaz+Qk1edijY4I/d5tOvR74TBeKaqM4xkv06/Wyja5JCJx1PCK/J/ojnALd2E1yleyfs1p8moNQU8vINIjZOeMHsa318Ky2iWFMj/7J8G0MBjY/PwYJKPDNV2fNPJ5M0arDCUs3t6nmUaOOIRoIDMln7O00s1kRIUcNZKOldq3Kyeg136Svou42bN/yMltZoCpkwj59k677SmCXG/jyN7Uhjm51EzERlMlPjH4WFQx1amf2nTjzT2j0yL9jiPTWTMqsnb9ZemNOpZh8XwgH+EJEadKkpmYjpAf0foY0z8oOOB3t0gC/exufHnU7aQP8mzGp8yliX8cbjTCSFI4WNoafrmoYpB00ByIWiE4ojyCfvLTXEigAAeil69TAQKJ+0NZCmj9735JlZacLvHM0UzK0GJauPv6Gt+wZoK4j3u5VA9fS4L+2vLYGdXcPRs5YG+dNVd+23c+zruxwocbKetnTy7ttytjfVjGJ+htwpy8wOS6ni5kMcLg/fcAanOxV5cPbt4MGeqDlZsJw==; 23:IrLRg75C9PSovVR/1tS+AuAtyzu3YSN/LfiGr5uSWVyLchXgsEbrBu59iA+gz5fvuHj3z0rnLljg/ZFjUMiVhzbxOqUwrnJGfgv4WH9yx27G/IYFY60q0p3EtrmgyW0uIjI2kGbVir0JZCbTP+9wCUU5j8MtvKtZ6xX90+VwlT1VsVuaDE1ijiVr5d2bwRel X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0429; 6:0QF7zg9xdLF0sJeWQQJi8wUbbH7jKcxOr4XvxSGTTTziOa6UgmpdsOuf8yLCD9vUKCciYO71KNplIG78a7j9lbXiA047XW4Vwm5hYb2Eu90UHZlSONq1noTTVJNu834kDkgkRu5qkU7L+/7Y7Cm5L7f7xtc4bvTfuD8DbVyafj5pttQ3eIHcQq/gmywQk3YY9S8JWbChpJO+zYTIYgbxXnrg4F3S71kGnhVcNrJH6n/aQl6bKUHKKli92TG2+ix97QfeSasW4408tPcLCVBPdxqQ2uvXjHBxzI4gayOuHOW6NnF/1GBYuSiHjTXuU8r3LPKGq044H2ilC1zjYhskLpmzP7FIIWReWLzfDlfdgToJ/2nJpycN4XBDYDsQ4xANh8cW1Gce1tEFbPzOxami+RcHuKhRLOKAZQW88dm4PEHDJnxYoOJSVbGlE+CMH7LQ; 5:2MXPavdZU4uYNdapmfH+U0ibZzGOASZ3dOh42milbXBz5yRCs2cSVdD9MOYS+puv9shVBGnDwVobhgR5Vgfk4WNBA5bGGVpcEBlhVFNEclzWHC8o22b1wEF9wq+W+TYgX1BXG3D9lU8bBnG5+ZIs2w==; 24:jon8XmrqofeEt42zdtx37fiTkMHED9RK+MmAuKOBmRFyT1I/NIaWgHFHeNaF7me0+izQtqkV+B0lem8Wgx9B8isSxEJGYTKiOJbWURcNVLc= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0429; 7:2qNsi40+MT5SZbOAJF/EJU0cHZL9JLZv02o/ErpI5dKtJzunngBoDwFyLmcgGPbGTSaeEP0ofRnWPVjwmy9HrRnu730CwadHbcR/C63gg14wa0QODwTgZtqqd4RtwLvxZk5ZqzKgV2+3Mn00XkAdXzWtY9qUtuHIXEBX4h4/lZu9VZD6YlxaBopoGPEewWK2JDp+DcPb13i/3o8ZU5xcch+mDf+anSqudIdi/97ZsTdxKE/6pWKG2wMq6YF/qtiY5UgZRohq2qEy5tctSRafCUHeTZHtHbxJXqlY2//wS7JWx5VyekYxHp4poz2bgiaO3C5L4/On8j96G1b+6WtcCT6Ehft/fQx8QTccuxuTqoY1If5oUbTxAwO0mcuNz7PGbaKbJOSTcrjCXriJMSRoaQ== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2017 12:16:15.9906 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[195.214.232.25]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0429 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT058.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR08MB0429.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] Revert "ext4: fix seek_data soft lookup on sparse files" X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 167e262..c63d937 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -612,17 +612,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) if (unwritten) break; } - if (signal_pending(current)) { - mutex_unlock(&inode->i_mutex); - return -EINTR; - } - if (need_resched()) { - mutex_unlock(&inode->i_mutex); - cond_resched(); - mutex_lock(&inode->i_mutex); - isize = inode->i_size; - end = isize >> blkbits; - } + last++; dataoff = (loff_t)last << blkbits; } while (last <= end);
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.32.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-514.16.1.vz7.30.8 ------> commit a06f7eb4fb64f58e10b6f4a04215ee3df8866b17 Author: Andrey Ryabinin <aryabinin@virtuozzo.com> Date: Fri Apr 28 16:16:01 2017 +0400 Revert "ext4: fix seek_data soft lookup on sparse files" This reverts commit a8b68fd3911361dbaf66da6786eb3a6d472177c6. We are going to apply a better fix for seek_data slowness, so this commit is no longer needed. https://jira.sw.ru/browse/PSBM-65551 Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> --- fs/ext4/file.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)