Message ID | 148194276235.13233.2367376233936593826.stgit@maxim-thinkpad |
---|---|
State | New |
Series | "fuse: fuse_blocked_for_wb must check rw_files" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.199.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Sat, 17 Dec 2016 04:49:45 +0100 (CET) Received: by 10.37.248.25 with SMTP id u25csp158673ybd; Fri, 16 Dec 2016 19:49:43 -0800 (PST) X-Received: by 10.107.134.83 with SMTP id i80mr6901204iod.151.1481946583316; Fri, 16 Dec 2016 19:49:43 -0800 (PST) Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id b190si7957730iob.122.2016.12.16.19.49.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Dec 2016 19:49:42 -0800 (PST) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) client-ip=199.115.104.192; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=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 uBH2lbBj005441; Fri, 16 Dec 2016 18:47:38 -0800 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp0120.outbound.protection.outlook.com [213.199.154.120]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id uBH2kjXH005436 for <devel@openvz.org>; Fri, 16 Dec 2016 18:46:45 -0800 Authentication-Results: sw.ru; dkim=none (message not signed) header.d=none; sw.ru; dmarc=none action=none header.from=virtuozzo.com; Received: from [10.161.30.31] (162.246.95.100) by VI1PR0801MB1853.eurprd08.prod.outlook.com (10.168.68.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8; Sat, 17 Dec 2016 02:46:39 +0000 From: Maxim Patlasov <mpatlasov@virtuozzo.com> To: <vvs@virtuozzo.com> Date: Fri, 16 Dec 2016 18:46:06 -0800 Message-ID: <148194276235.13233.2367376233936593826.stgit@maxim-thinkpad> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [162.246.95.100] X-ClientProxiedBy: MWHPR13CA0019.namprd13.prod.outlook.com (10.169.208.29) To VI1PR0801MB1853.eurprd08.prod.outlook.com (10.168.68.14) X-MS-Office365-Filtering-Correlation-Id: fffdd7c3-542f-4e74-686b-08d42626ee2e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:VI1PR0801MB1853; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1853; 3:tyAyY0os6GcoaTn5WJ/MD7vKAEiqxYCbZ//P/qAfU67G8NCggGC8XE/P9RS6J0Dry7BORA3iNJRY0nn2klPMpVXNA6X5wMRqJdCHFmqCuVEgLvfKfdqr7+w0Pljd/6cCTj59vAMvyEFfI9sAGH30/vjYN1L3wnR3fzS2D7qEeZvOgtz1+HSNpxdG+HU5M3MImmfrTOdzCQ2hY/SOGIHrCl/OXoul/5fSXQLFe+EhfiTGlhxFmhhru0pfdng4d2YRnq7ShvPQxdB50vX7VTD1qQ==; 25:8YbSR4tRsJWdQy0fDi6TPebsP33BLyBu+XeBptciDSdEV/5Z6tTFqdUqWP0EGEq3qRuG90MFKEcX7GQMJ9SF8jw5p4FXdAlC/904W25m1ECsSywKAu+GZtJeMzra/5BerEBx7+iMnkxjmN+7Al6r3kaRWQl5p3r5yz1CQmOX0HDhXLwIBgPGNSrwP4u5m5IYkXjF17+KdM0GgumDwHrwcIe3gmcTozolL2qoVbPSPpSpI2PnKznBYLHfINuwCy1nMAhSG7bW3EZi7eJ/Ms/zu/T6RIHWaPkv2QtiP7LMgvqXJNYwyJ3GlO9dECoukQI74YjJeIssBtLTIOVAB6VEtEFjcP4NUq6Slie35abQxFM2wt++Vh3OmlOC0Lo5PxqDulp+/7eenQLwXoIcABV3xPOav523BDbQu/hcgVOqsvtoovoKkWooB2rz90cp+4jjKV+f0BI3x15aRXQupwGXlg== X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1853; 31:TrPZEI94enOKt0QK9BE918P1oiEIybxFbJibbjqA3dIQ5XSenrKY2VPctfj94pSMAzy1dtSYLqvL6R0gvKehsTVm0n65yQPHzX3218TR/rfkuoC+vnnysCD3byJLSjyz7gRSVt1LHXu+PYWDZ+PExeGzNICk4Ayvgo6isXs8y3KJhR1N6Tq4/vOvMA5NNCFQgzUagOZNpjRKN/CWDn3ZycQIteEFzURj8+XtCprHUnGJJL/C3uewGchabS6yVivRWZCjT0A4gA8521mxvbY9RA==; 20:sj7X6lKgU9Tp+GfYgf2usYDEcOPUY66hgmvjrPa2M9y3TpUaOVDAUIbORDKHSL6q06P4MNZM56ARPRNfNLQyQAFp617YAWRzopIocSmxPpKbHoz4J7nfp5s1AJ8LkGNUqRYusAhPtFa+vbbAOK1fliT0+YmeK5RuI/CpXQrm0cc7uftWKxOrIZHMWQhzUQizSqIIylYqsIr0FcQh0U0WXjddBVmzPmDqtF30MfmanLePbNloVjn0tSkDoviPcRRG X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524098)(601004)(2401047)(8121501046)(3002001)(10201501046); SRVR:VI1PR0801MB1853; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0801MB1853; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1853; 4:eKPAc/AAJmNUpEm+swEZyP3MX7/lyXFp4YriTFmPqOYg20OGYQZvyEjLsH1+vlLPmsFaxaR2JhTli7jB1I6HrMej9PfVbxYUsI7xiBvtmhvUe4JzL9TzgOctxTSF1dREYB83/GWZy6Een6o7Ix9EGQxMgG/yV+2N1AjbwIm0WJD5Lvw4qxGS7f0E+LQ/L79t8mOHchw95FUg2I14G+Siys9I9HdGvOc7/F465Xv3W14Qg8RHBW5CbiVojgAqXRTtCek99QKBDaiBuH+Bo1MtccQJxDO17QyiYmHX6tJ6yG2wjG1Dp3HBbcVGJ+oYBHhSaA8UGB+AkHGWkYjsNInAIHYJcT0U9upPpAQob2p7++L0YOacYJXYaxjpDG1WTv8e7L41x+eYWPy4IFz4sQrHqi5ud0KyeAQDx4HvTxIdEOAicU1l+KQlDR2VBom2FbqY; 23:DEFJfXMC+vNG6VyY9isVxcgOCpCisW4XxPpyL9zEhz9rq3K/sLh+ygcTFsFAPvnXFYYI0QMV4DYSjayOxgNhOJXl1VZpo5x/pJ9NJGUzYiwwzuAlvmhznlaf8+AIbzm4efHdfJz6HC1c1w0fA4H67w== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR0801MB1853; H:[10.161.30.31]; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1853; 6:OZGdQwuxyp7F2KJEKTKnRRTvnlIR4opC6UYdr8BBKwTFpFwaEkbKYFD9v8vr/ldlj+yL768TkAjD8VLmPprgIt+/L2CrEzoMv1aB2jzC4RmTvygZxTMw1yuvJ9iRjoeE7YJD8aeGTV1XZVT3PaF0ApMXLiPrS46HHKO9+pBOTYeoR67iFHdeQc/FFlkUgpTr1XO38cJqSCg57vxIyw9WUS7WP6O/2GYj2SzpHjTXfkEwqMAiWNmy5K6zE1qIOrfyFmne5y6HAGZ1WACSB+El8gdN1ujCZw8VbRENqbRJ8OekhntJgTSLXqIzIJCSOCd4i0EkgLz/8vhX1u5ZtSlefcrETDCp8E0tBynbZdwGft1Ncv0TbHksgBOXW+LwgzayODC4w1omux+aN1ntzPZgD0wxF3DKEPMN00II8qD4jR8=; 5:VpUrAs2FjWiOuOXvV5hoJjX5pdR5gl1WZjausgvyjlTk+vQZJvgFQtC5QKCExKunV1z1Y0c2Ft1ybHihA6+1KXDWqjUiszRDXlBQNbyKlTUYKHaI/JprUoLdn1nm0/+4K3yis8MQL7xG96BDxHs0gg==; 24:80wiMYgFdaHn+cpvp49JB51IKmEXB0dnX/ySvKmI/3huO8/7V1VDPd1Cdr/Xu/AngyHjve17XYjrWTA021aplrYemcq7Tj5s2Jo33WUwQJ4= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1853; 7:N2dn/g42YstQT0FGt87GA023jcja4t8fMhfGQdHW3DmfDOja4WROWGobgESWFt9kS35Ywy54SH6XHyw5oNyZCOER8wjgZc0xPWNTd9HDGxJK0CpNCQPrAzYBnWOpX7VdtH0RpKppz45sVcORQaOcs7dh2C3CMlPsRM9P8HmMfpLVh4dZswbDZSdJpHyXC6edaDl2umZn6gDDWTYjg1+BYJfHKqZAik7K80sVefuWN3lZpcWVOt4DNLwcvklpddKocIdMdajrjgLaDN0+d5QjfFT0ZGAPqOc357PNPufUeK+/EyzuBTx/Gn/OSxfW8GwOO3ut9MuJngQmS6iBguTfg538UkhzFWdU3TzSE0ALz+fdahQolDvBRmHivMC2xvnzmr2BjXyTwEQnzN2GvGvjtfu87KUR4TPSJnTK0clq9nLKlBRXixCHZxDvvOJoW5CzarfF25dNlQ9WiAFut6RIPg==; 20:+GK7A/VPaXh4BmXUYPr1WPAXWcEt+XccCi6kzK9oX1JUVgew17Wy7AbcJeWJ3l8KDspd/ZsvtI2I1MkCRWfUes56OhTfGK2+6brbRgV/XdIbM1CNPWDiaI5Q/83BqSOtQ9cl0MZphdLqI4ScKQg3h+EJoyd3UDh3ZG3a+7VT4Cg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2016 02:46:39.9412 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1853 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 162.246.95.100 X-MS-Exchange-CrossPremises-AuthSource: VI1PR0801MB1853.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR0801MB1853.eurprd08.prod.outlook.com Cc: vzlin-dev@sw.ru, devel@openvz.org, kuznet@virtuozzo.com Subject: [Devel] [PATCH rh6] fuse: fuse_blocked_for_wb must check rw_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/fuse/file.c b/fs/fuse/file.c index a557d5a..353092c 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -2155,9 +2155,9 @@ static inline bool fuse_blocked_for_wb(struct inode *inode) return false; spin_lock(&fc->lock); - if (!list_empty(&fi->write_files)) { - struct fuse_file *ff = list_entry(fi->write_files.next, - struct fuse_file, write_entry); + if (!list_empty(&fi->rw_files)) { + struct fuse_file *ff = list_entry(fi->rw_files.next, + struct fuse_file, rw_entry); if (test_bit(FUSE_S_FAIL_IMMEDIATELY, &ff->ff_state)) blocked = false; }
The patch fixes a silly mistake leading to a deadlock in fuse_invalidate_files: so far as fuse_invalidate_files sets FUSE_S_FAIL_IMMEDIATELY in all files of fi->rw_files list, fuse_blocked_for_wb must check the bit in *this* list (not in fi->write_files as it used to be). https://jira.sw.ru/browse/PSBM-57460 Signed-off-by: Maxim Patlasov <mpatlasov@virtuozzo.com> --- fs/fuse/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)