From patchwork Mon Dec 31 19:48:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 1019705 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mit.edu Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mit.edu header.i=@mit.edu header.b="UsHEoIqX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43T7D219MSz9sN4 for ; Tue, 1 Jan 2019 06:48:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727498AbeLaTsr (ORCPT ); Mon, 31 Dec 2018 14:48:47 -0500 Received: from mail-eopbgr750132.outbound.protection.outlook.com ([40.107.75.132]:51328 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727311AbeLaTsq (ORCPT ); Mon, 31 Dec 2018 14:48:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mit.edu; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4ylo07HFHKjUKsDILcjQGj5JOFsKrzKT+yTqnvDZWTc=; b=UsHEoIqXtrEgULtTtILAVGogSId7MolGA9nMwhgV+G+so3zphaLzLaCpbijOiq0hnvUIbK5ESwTKRxmmi9RovcDyus6cRM3khC9X8FxVI3d9WI8SN1ioWu50o+jM5jdtOkUmy4ThKdKv57N5Sz1M0OwySwSDPKmQ0aygYpUq3Wk= Received: from BYAPR01CA0044.prod.exchangelabs.com (2603:10b6:a03:94::21) by BYAPR01MB5525.prod.exchangelabs.com (2603:10b6:a03:123::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Mon, 31 Dec 2018 19:48:42 +0000 Received: from DM3NAM03FT007.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::208) by BYAPR01CA0044.outlook.office365.com (2603:10b6:a03:94::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.20 via Frontend Transport; Mon, 31 Dec 2018 19:48:42 +0000 Authentication-Results: spf=pass (sender IP is 18.9.28.11) smtp.mailfrom=mit.edu; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=mit.edu; Received-SPF: Pass (protection.outlook.com: domain of mit.edu designates 18.9.28.11 as permitted sender) receiver=protection.outlook.com; client-ip=18.9.28.11; helo=outgoing.mit.edu; Received: from outgoing.mit.edu (18.9.28.11) by DM3NAM03FT007.mail.protection.outlook.com (10.152.82.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Mon, 31 Dec 2018 19:48:41 +0000 Received: from callcc.thunk.org ([104.200.153.98]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id wBVJmdHd006844 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Dec 2018 14:48:40 -0500 Received: by callcc.thunk.org (Postfix, from userid 15806) id A2DB97A0192; Mon, 31 Dec 2018 14:48:38 -0500 (EST) From: Theodore Ts'o To: Ext4 Developers List CC: Theodore Ts'o , Subject: [PATCH 1/3] ext4: avoid kernel warning when writing the superblock to a dead device Date: Mon, 31 Dec 2018 14:48:34 -0500 Message-ID: <20181231194836.3761-1-tytso@mit.edu> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:18.9.28.11; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(136003)(376002)(39860400002)(346002)(396003)(2980300002)(199004)(189003)(2616005)(6266002)(6666004)(52956003)(5660300001)(36756003)(47776003)(2870700001)(14444005)(305945005)(2906002)(90966002)(356004)(1076003)(88552002)(86362001)(4326008)(8676002)(450100002)(316002)(50466002)(50226002)(126002)(246002)(42186006)(106002)(786003)(48376002)(478600001)(36906005)(486006)(51416003)(6916009)(54906003)(26826003)(26005)(336012)(186003)(106466001)(476003)(75432002)(8936002)(103686004); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR01MB5525; H:outgoing.mit.edu; FPR:; SPF:Pass; LANG:en; PTR:outgoing-auth-1.mit.edu; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM03FT007; 1:Kfh4XuLAzxo565XlRfcllbWzOSgV36DajFm+t1M8PK0b4+mMP5kRL5DJllZrwEQXEBxc3ahkIkSgzBeBk7Ubn98Ix1sySPlUfqovgiDAGx+t8Ou2ZjLHtYYguEZqxG43 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d0ef62d2-307d-411d-53ce-08d66f58f77e X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600109)(711020)(4608076)(4709027)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:BYAPR01MB5525; X-Microsoft-Exchange-Diagnostics: 1; BYAPR01MB5525; 3:Ycf8ANj5ZaZS0HH4uwMziz30bG6s3HiKL3IBN3eJ4x5gpda971QYxziaidtu8uU5X21EZ76spcrgLcNOvE9UC2Lq3bHbIZX1/co3yVe/beRrv+BU3Yl9JvFprYwdX3qJmGax8Qow3y7YyKIW9o79R+5TV3xw637xZ+oxQx8fC7j3ORH3vxqKBb27BJn4eY40CRVIeOUuphTF68e8L+h5YDNRZNGW96fpVyzbHvE0lh0eKutYorIDcj4WgGTt+1L58T9CA4Gxx5INFe5AtGxY00jswAJw1Saqbxi0LK3WPGEbOhQDhS7i1tnXIljpXwwwK8g6RB+38yRM4ZF2+UHoRg==; 25:0RSTANkr5Ir7vTEoZJ2KHtQyjFnbnEQuaTRgA+v6altdBMBpnyutSPRePVx96bmXxMcRSoUjbsmosaBjrS7wfAB7YAd9Pc2lffDgawnwfxKJRP5hrhrPy1gfmoqKo2RY1WB4ohDHsDlRY1viEeg5fN4PeWp2lCJd45b9Dts4h2ZRdJEkPXJ9JmZ0fyBSZIfWHOzT7gySfgn4tPQ3s0Sq3HTHl2rg2tnYhN2Bzr7U06J6aF5XyKrb/iXaegKZwm8MjFvSgmtsXUi3PfZLH/3ZYkBOqAQoN8+6uGHtFtimCRUwxCzgIaFjcJsioDh6DSTq7c9DBV6O2xAPDN7LAHtw7A==; 31:TKGhY+gq4f5XHTUrx6FK+dPKx9OI8htvcnBQaXWU0S8RujjsH/Zlj6a2eM0DvpH1uudrGeCH41qvcFa8l7rj2kAxeSdYK6VA9RT604HCUsSaJfjWbCXbXmnWUr8Toqtu5z/QDt1+5C+Ywhcf89GLlTeFAZiYUjgFp3ILDe4CiV7IO/4uHJ5TzhNepsuW4nxViNFqeIwnkSEewDEGjHm4vHuisTZJ3hojMQE6MoW4cKk= X-MS-TrafficTypeDiagnostic: BYAPR01MB5525: X-LD-Processed: 64afd9ba-0ecf-4acf-bc36-935f6235ba8b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BYAPR01MB5525; 20:yBCFC9T6YUqFv1239lPx5qbfrvRAMOM6QH0I6n8U0TO6xykZWfxwoN2iM+gqtQ1r3v2UlWM9ikb+B6v195GsoeLyzGkZrxt61yZ9M0YwGFcgxesV+GIl2GLJCAf+VXJWYs5cDWk3JmGMM80462+vEhUfbxBL0RXlYa22ZMU+ldxLJ7iVp5jCHoQUnSlZ1IacnnT8pGzGcnm9fDmuGhbzfi+2YzUwg1cBlr0kWZz8zVO2W+cnh+mInXzqpPeRiq2i8ImWgzazVc1pPcxQyHkcvpNEDJ/E1Htv1trID1W294+p8AM0TjDBjg+DFjEJmudi6hweHKJcq8EeVA4MteifVIfoSNHdPKoe5/iaizpzsTlkZmZw7LaPVfjgcNFhSMBzDp+tNswDQNekWMYNMhWTmFq7f6Ew85aN/XWnnFdklnm8SiTfda39562uJqwQQhguer2wpYeKu3UXFDz5Tm2RH1/rSUgOMDQX7UsG3+82pk3TIAm5Mfsf0M5heYu+YzYp; 4:TBDhJReN3P49nT0ZRFvevG4AcwkKDYXbP5H7wGzu9jKsQdnf3uUlkhwVwzcVxe23gOGsR/1Ihoun8v/sy+Aik/By2gttxWXk2faiJGWufdWOi/CMrk0ubM8h/G6ujdYe36v3qIt/AZbKVwHFMagZIRp8+M/8B5Y2wtq24uz7r1woACJGq6Ld7uj0S1Xt8Mkkok7MCxlD6Y/fnsJsfya8wGpZqTKVDqcWcR9XK2oi6wciPRTr1t4f+/rTznc1UByHyMwEaOB5K51Mbi3O9TF1ow== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(2401047)(8121501046)(10201501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93004095)(6041310)(201703131423095)(201702281528075)(201702281529075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:BYAPR01MB5525; BCL:0; PCL:0; RULEID:; SRVR:BYAPR01MB5525; X-Forefront-PRVS: 0903DD1D85 X-Microsoft-Exchange-Diagnostics: 1; BYAPR01MB5525; 23:1o9J07uZHPzB50Z7sr1ns3tshBAo40Pms+gPb7UIwPJ6AqJxdYUCe2w91o099hB1DLsUc8RUkseu438DlPfurv+hWgRVNwoypsH/10gOHb+qeCPA18WrRmAwZfwSMz+VUyXoKWdrwUGGo2czhTtllXDql28mWl1krPrAwodXqlKxAVOwku0bRpUa+Bvasb1SrkhwDPjah66YcAenT3qz4UDBpsdlMdGOVX9z3NwYftuYaScTJi8/MJNlcHyee+QzhSJmyMVuhO2sVgEC6go5s3N9ihUw1fg6cqDkkeZuZ4QliEcKPvsQ+V19WGeNV5Qs3xlPoYgCkRve4jhLoVVGwyCWO1lRtX50pMKZPlgjLi9DKiH0SIKVwtUpU99y53SblMbUzsCU+7hJ1K3FS8GMDyGU2vxdkpWrtwVxijAdylBahMYPGFTCvUM6R6OaQN2rbwSsa5WlmwXQDoTpQvsmMi5pl9hY/Y7hMo7kO2vcd+sFRFx66OpycSuEuHI9c4ZmuI2mRovU1KdlXGnpc3WZLXGNEjJc/fQQxrdQiOZK7UWSHaZcOqxvXDbJcyRzcMkcMAhOALavQvnx8S7fCPDn5OHIYk2DlKOufP/bB8MPm1TK1x2ODsLaWmQBNOcSDkDQa/NI0Tr7SlQqJbkW83qvgS30/6bAkb9ETmQJaI+3FHcyp68hkd8tAYhSrS9pgqWa9a/XkMgFSGLCJQD16+tNMDSGLOE4e4DxBJ3MB3BSesKE0zEf6mfi5MQ5YQqOm1Zl5aLgnUTRS7cRn90rO0QLcJGmcMGvChRNxyfJvVdlWoeZhk4iVd/Xs012/0OBql+ZPgajYzdUcwY+CohsIkhuKsNcK8xddGE3ht6FHjs/RIqpwfIZMPBObKLLGF605OlpmvfPaeEzm2jKzXzV9SVx+QsCwU8OEfJ1peIKfIbkmbCQZd6N5dnLIZysHyyq71KrUrsPBsXKx22LBJg5bNVnYPq9qu7XlQ2mWAWelnTmzyXcPZTgh5wnJwzVgk+q4x7qc/QpqxhHlbXgfsIH2RDpsDlcOz5BsENHwzvzVdlOUMsU1+9+8jFTVqWMZnu16l7wgE0X3U7KjUUddj/t+lf7XjRsuA2W1X+qMrQGGogO06qNoO7qn14CIP9O48TWOyGK X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: PknWgJVB3LWfX4q7ids6zO42cMFeRYxyaBKbfsrez0kJ1s7Jw3ssvRNrMYUETV1nfRWNx1HcxVIXgNNhH0wV7f7YTyXJcB/6SmKjhr3PKhxkY/5pcZxOogodpVqbnzQO6mxKTlZ+dtl4uDnNFZ73H91FL/g5HRr/sQ/iY8XT8PWfkpdXb2t+mFG80cR00rYl5egZEz04wIsRCA+tJuRFM8U59HRZ6BU/W5mOeonYRPTDDhEtawZwDyVX08z6XN/XiHnxL7Yw4+pDbWf+tlVeY9/uWUQV3VUniL0dMDecnlZhmWzhnBoYKSH59SOCULne X-Microsoft-Exchange-Diagnostics: 1; BYAPR01MB5525; 6:Bo+D28n96k41OGfO7yIti7xjoTUtpSYkw9MYfvqEZDOG4qd+KZrV07SqGBr4wrspLvmLjjdLgO6Yf9tjmyDwrwpr2HkDKOLX96MdVZCz/Vqa9imF9SWvMq4FSERyfsBrzSfP0Nb23+2CtyvInmaG1+K7E88nOQN4c2BS0saVS8Go+do3WXVn6e5pPM08gPUA2BCJmPF6l0Rc86D6iPMCc0A/OXKN70NA4AAW08hRdxQxMHsJ9g2KsalaZS6qMD+10uzXeSnpIPEZYW/Vga2xw08jJqbP9F+kCYyYckmrOHHvw0QOqQM+A5UFHyNOrIu6hx893oZjXZqgu+533akJ5h+7vqLP6mXmlXqXNj/x5Slsq94bzBVDKKrt7euwGIxZzaXC/99UDFeHqbANdZghwZidcA5MTgL9+1oe+u5GwbCbI8r3dGOTesS7n5ZZCN2Cj3opJmjqpgjOTflX6Dn66Q==; 5:desHs8ovgBBv5l6+cPOdJ44afPOvyKwpoccb0+nxe64cj9tHV9cJsXN5mQFlBINxyjEHve8sTAHrQn17y7NhYRjONgB8hcoMaXuoHhYMyJjKE0MY0E5euZy/w0jjy06b/MxhHMw28IE6Rk/XtVwfClA6glZL57fvAZh3Zyebj9w=; 7:xfOE8lVkrzTCS76PHy4HMZUyTlb5vObxEIbHz5NfRZ6VJztfYdUW0xidacOhSCz5K9BrUy4Nifp1um8Nix114HlgWxmsS6CJifDQpQcnR5OId5k3QeIM1/1U5td7BZDpp+TwTOXGjQtmqao+YWlp0g== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: mit.edu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2018 19:48:41.7060 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0ef62d2-307d-411d-53ce-08d66f58f77e X-MS-Exchange-CrossTenant-Id: 64afd9ba-0ecf-4acf-bc36-935f6235ba8b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=64afd9ba-0ecf-4acf-bc36-935f6235ba8b; Ip=[18.9.28.11]; Helo=[outgoing.mit.edu] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR01MB5525 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org The xfstests generic/475 test switches the underlying device with dm-error while running a stress test. This results in a large number of file system errors, and since we can't lock the buffer head when marking the superblock dirty in the ext4_grp_locked_error() case, it's possible the superblock to be !buffer_uptodate() without buffer_write_io_error() being true. We need to set buffer_uptodate() before we call mark_buffer_dirty() or this will trigger a WARN_ON. It's safe to do this since the superblock must have been properly read into memory or the mount would have been successful. So if buffer_uptodate() is not set, we can safely assume that this happened due to a failed attempt to write the superblock. Signed-off-by: Theodore Ts'o Cc: stable@vger.kernel.org --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index d6c142d73d99..fb12d3c17c1b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4902,7 +4902,7 @@ static int ext4_commit_super(struct super_block *sb, int sync) ext4_superblock_csum_set(sb); if (sync) lock_buffer(sbh); - if (buffer_write_io_error(sbh)) { + if (buffer_write_io_error(sbh) || !buffer_uptodate(sbh)) { /* * Oh, dear. A previous attempt to write the * superblock failed. This could happen because the From patchwork Mon Dec 31 19:48:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 1019706 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mit.edu Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mit.edu header.i=@mit.edu header.b="SXvsg/sf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43T7D32bcwz9sLw for ; Tue, 1 Jan 2019 06:48:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727495AbeLaTsr (ORCPT ); Mon, 31 Dec 2018 14:48:47 -0500 Received: from mail-eopbgr810107.outbound.protection.outlook.com ([40.107.81.107]:16128 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727392AbeLaTsq (ORCPT ); Mon, 31 Dec 2018 14:48:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mit.edu; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gi5My60Ro39yuKVArOEuY8JPynHO2j53/VU0S24HU5c=; b=SXvsg/sfFghQm0V/jEb/hHRHa27Ap6RrSDWSoMF1vy7uxpR+0eE3iGl6VbT+BqskLzgTEx1wQhaeBL92ZgZ5WwRRkDjQx9EDT0qUBuXuw0mzjqPp2jw/5WwH9jZsb3o1bh4RGQzrcz4pTYETPCnQgHHErnmiNh4q5EUN9cNxf4E= Received: from BL0PR0102CA0042.prod.exchangelabs.com (2603:10b6:208:25::19) by CY4PR0101MB2951.prod.exchangelabs.com (2603:10b6:910:3f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Mon, 31 Dec 2018 19:48:43 +0000 Received: from BY2NAM03FT047.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::206) by BL0PR0102CA0042.outlook.office365.com (2603:10b6:208:25::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.20 via Frontend Transport; Mon, 31 Dec 2018 19:48:42 +0000 Authentication-Results: spf=pass (sender IP is 18.9.28.11) smtp.mailfrom=mit.edu; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=mit.edu; Received-SPF: Pass (protection.outlook.com: domain of mit.edu designates 18.9.28.11 as permitted sender) receiver=protection.outlook.com; client-ip=18.9.28.11; helo=outgoing.mit.edu; Received: from outgoing.mit.edu (18.9.28.11) by BY2NAM03FT047.mail.protection.outlook.com (10.152.85.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Mon, 31 Dec 2018 19:48:41 +0000 Received: from callcc.thunk.org ([104.200.153.98]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id wBVJmdV4006846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Dec 2018 14:48:40 -0500 Received: by callcc.thunk.org (Postfix, from userid 15806) id A65CA7A018D; Mon, 31 Dec 2018 14:48:38 -0500 (EST) From: Theodore Ts'o To: Ext4 Developers List CC: Theodore Ts'o , Subject: [PATCH 2/3] ext4: use ext4_write_inode() when fsyncing w/o a journal Date: Mon, 31 Dec 2018 14:48:35 -0500 Message-ID: <20181231194836.3761-2-tytso@mit.edu> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181231194836.3761-1-tytso@mit.edu> References: <20181231194836.3761-1-tytso@mit.edu> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:18.9.28.11; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(346002)(39860400002)(376002)(396003)(136003)(2980300002)(199004)(189003)(6266002)(52956003)(106466001)(356004)(6666004)(336012)(4326008)(5660300001)(2616005)(478600001)(476003)(11346002)(486006)(103686004)(14444005)(1076003)(126002)(26826003)(446003)(106002)(86362001)(90966002)(42186006)(316002)(786003)(54906003)(75432002)(246002)(76176011)(36756003)(51416003)(305945005)(8936002)(48376002)(50466002)(50226002)(186003)(26005)(47776003)(2906002)(36906005)(88552002)(6916009)(2870700001)(8676002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR0101MB2951; H:outgoing.mit.edu; FPR:; SPF:Pass; LANG:en; PTR:outgoing-auth-1.mit.edu; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT047; 1:NMfx1rMrbwrAPVZJKYi+0Ydzz9+dXVzMe6WcLoc5x/F/mTV9OXL5kZnRfPSwOhByUUYJ3S7AHGK+iM3WCvfM3pOzfqFiInITgC+g28GBNP1tTX+p45th6GyIfeiBTx3x X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c3399440-6df2-47bd-b3f0-08d66f58f7b4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4608076)(4709027)(2017052603328)(7153060); SRVR:CY4PR0101MB2951; X-Microsoft-Exchange-Diagnostics: 1; CY4PR0101MB2951; 3:1OTv5QW6jIwG+0IvY0oLft8aQNElXwSexgO865MVF/9+eWWk2x6VfHdTQ4HusYsZ81yyM6PG0B31aiT+zEfDdVYiHSHf7d5iKUw1Y4cwnSnBKDGJATowMtz0z/30jQX1BwsP+i9PQSRt/pes60uIaD6YXuYseL/hLxCWfFD+8wrZEzo89SHfKwk7vyh0gq2ui2A2Mg+uBSjdPkJaWeduarR+3DlgaQ1D9RJMFIroq1ZkhyVNLyI7axtDH37+eLHFc/RTrq31j7c1UC99p1H9BiAcf9pdhfdybM6D4DPl/2wkPoM49ktCJ+Ovb7KEcbt8jApjhhCxQyGMD1YZWjfKMQ==; 25:qAWQ9mYA+ejZlwl0WnvI8j33tCDZNwKDlKOI0tviYVnVZ0uXuUob5ydKScC3fUBsOyVJhYCtgBaFU0mNgtyj7l6TLHaqJnCSLU2RVMDDdESjZslsUypZp9BvA7OmVRENowVybP8SYMUwlGCdtMxG66XyFr1C7Q5vnc+EcLj3tyHEcaUKD2dOltAWPISgsYuic9pbc4azx9OVEj5mX4vTwtJU4T7bkXrjSsvsTDg8eeWM+c8qH8V6Fmybo/EbHfLAqGhZm9xfE572dXuealatetilr3vM8n+15wsAUUotpXOvT7Jy/31P9j45JGJIC/MjVYE0RTW/OncnppfllqTXrQ==; 31:dpXmwodUePZ+ZIHi8D8E9B/roK7Wc74eUtnhhJWRh/Zn1ux5/pF4HwIJFKUiMKW6vY00L64WFEwMZiMgSBuNFJlb/BO8tcqKzjDT8HFUFb6mFwVvqLevRDAbdHKn4dl4TTmgFh6B9wWXJFZHdxkKVVqKCXXpsLhGaEyp2bMcW5H8OYRiWn1z1wyUSEbyJDQ1oBT9rUGAThD1rbJJVuE2a3hvaXc9p+EeoN4m0iWD7lM= X-MS-TrafficTypeDiagnostic: CY4PR0101MB2951: X-LD-Processed: 64afd9ba-0ecf-4acf-bc36-935f6235ba8b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; CY4PR0101MB2951; 20:03SvuEJ4pCAiVKQSfXi0zZu1dyktnzYOZ82EkdMip0DEFfaztNAtVQW3IbOE4g4cHqhc+MheRQwm/WnNqJpVUlMemjS8snLyY3bHckRQVN1EwxNP/CZZCc6ShQRR9+soPfoDCdJin+/0nfRLMAE2V5aeKxeSCslqyO7clDUG81pdeSqHhmzhFE9TQlhGeQUVS45Jr5jDaZwCWUCXb+5jzpUDEPFjUYrnjJ83kq43QujDsK90mvymYT9aQnuOlYa2XVKLY+i9+FSeH3bfmYBtZ5M5oEUzro73H8xblglbcODRQgKwwFRnxUgaXzrw/PF7eU41z7ZqGOBZnyJ0VZIbuyt9gEYa0JLC6Dt0lqe3i40GJy9JLykJ9X9N9/4Nh0NnKx3aC4JD4xMNMiCvI8RHg/sIA+DWiAnzyBzB1+fFKsAt8ZI2Pq6yIqGmmwgV5iI2hne50ZIwIVxZlcnNpm8lidnxvOFjXp1RSvaNBxkBVIaZ1Uc08owDP3SDqHZ8Fw7H; 4:QH6Pu0VsRjBZAaTijhgNbqED7jVlhC2Ka09abNws0I2Rjo5X4mglc/Ao4oBMxqKGg+0WqABpS42fD0s186gBdsCDKRWr9J4I9mfSY7f16GhHRapBUU5hkpqU7rru0XEArOaxoyvRwkrqIVJXYVkrXa/qkR/i9q8ml4HsOmoVajsqmVil5hevT7Rd8rLqkGZsnFDA+jonVULG2DexqxmMTDzOjFYa8VgcWmObSrj3oOFI6C5KvYdUJhQSqa2s0fCflO60T6CtcepW1kQIqOtufA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220055)(2401047)(8121501046)(3002001)(3231475)(944501520)(52105112)(10201501046)(93006095)(93004095)(6041310)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(201702281529075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:CY4PR0101MB2951; BCL:0; PCL:0; RULEID:; SRVR:CY4PR0101MB2951; X-Forefront-PRVS: 0903DD1D85 X-Microsoft-Exchange-Diagnostics: 1; CY4PR0101MB2951; 23:zi2fMtvec2c0iFOq1ClmOPO18WAf1eeLML5H5qrBvG5VD9/Hw2dNZmHldaKGgCECQF0VeZe0Dt4xwhZMXgNF3vDhtxthYBd21qwAmIsSr5sPLUNRjnaDpIQgnN+MKn++89onMQMozpKfR1y5YCylQhFd6twznRnSXeDvgBzzh0a/qJy+29AgJbQCVswPMvTtpcu48HXj0VtIHd7MOtQT+IRVzMbmFiFYZL2aGdT+9mGWSyblx++oLAiq3YtiOO9e/6bGZ/ZqiGsDEooUmPDhLzuVMX0t82PzHux+oLRdC8Ng5N6NZALsQIuLa5SD/6mi3iw5M/sUvMaSqQP2FA1WuiAZwfZUCO+nSmzJeYiZzWL/cbzZUn0fI2DZw03g/AZyk1dNofYw8S44GTf5EldrRa4WvPit7zWz0p4nDkbJJ9DUNYCbfNNVzNBXtsAPvoCl5uNG4nFn4CTppVw7L3il/qcfOV/+0g/nwa4QtSpfxqo7TgTqMOLSTJofzpsN/CWZ19xLiXJDbEQptpaMiEBu3HnQliRICDsxe0EMi/3n+dNec1DCLQlVRZbnrqirIhNRFt9BzsIYEe1oq80Ji8n2LAHFScrYd+dROiZilGXCva8qPS/CBfioxUexsvtdOQyDEjxGtwWxLQEfvqfOe8EskmU3fLcBNmiKhvh7tWIMYBgNuGmy/PHopz87I9MAOlcRja8D7TPpE+PtsqORwulUed4iagnedLWKfwu7yRwrYqlEaODpqx9wSLIdK5b7yPWSDiizbOAiNxlwb2VQy+l9xUjFMPK21Td1s/owcRKQj8clsvqBxnoJO6aP99YSDyEtU/I3mXB114LJyFXTCUQj6c0Rx6xFQmqbos17bxiLKI09AdZ6ZolICAvI8QF709BBYCUuPHeNUkMeAeo3tov2slnMHbVTSFVEu4aY9L8/XfMhBmLY3VxRfkad+YDxENawLqz1Jg/8mqE2U3czdAjdKE9qvNgE+eW3JkZK9TaRLa/9Q220+KDGCzXHEsK0kVSMMsMTmzdiZQzKbU6IJrNf8kv97kQcm2wlkaMU3/zcKg09dHozzhBi5D/2yaPk1wodWYqnImlmoJFzQ9yujDHRk45mbLJqaAiLOoroGJ5+sF8SqmE8dHdbOdVcNW+mw89iQGfqpIHY4Y9ME2EXWc3mkw== X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: rb3KEopYG/Bf/Fi6bAaee9ITou9GRkWu0KgobwKaeXEvoey7YuHFZLbrhiFFh44fkTa0zOVEcIEPIIwbIjRHU4grNdaRBWDBtERWUM/XiFnJOsQ2ZRSYfSTT78XhFDh8z9U8NsCKp9r2a2Ky75srv+N0T065zTj04z82oIwti4lj2hXOoO9wui265oGZmYMqO0dN3EvkPCm3ScFEDzjYw+qEDxn1rrsNNBxOM09TJLoDp35KwCpwcxwZsG5ZsrgSouLRvi7Ua9E4zIQLmQN1vYw+9HdV3R3LCC35hioL8YEFrR0jDK6m3ONvnUOuDEGb X-Microsoft-Exchange-Diagnostics: 1; CY4PR0101MB2951; 6:b9j7OqumA5GC03nNwitVIenBSM5r7IUEUqgp23TMVJ1Y1drMshP29yaJfCbFquxGinZxTopHUzHuL6jQ6zCWkmkWUJO2d+AnVH8XUUy114MCbc8wA4N3UHinGpNNYkctC5R7i+yK/Jsi9ScQyD/lTk/pqUhavowiBrDp+5xr1zCbbyz5BQXPaeIerNWSfwOfo5Dgt5FKf1kAmniXHYCWJ88eGfDyKHXVW3xoiU9ubV1HbIJsIWkJBbxS72emhfn9+NAIjYVGozGY67u3RTqumMw1f3knUCc+5oqeyIQTwvoDXKxragz6O8gGVeoA5qmiJjzruZOsIwVIHdoCYfjCaxVptYJFex2fz7MtnBz4MvkdUQP0B1bTwJqXvGpzsyxsmaMcb9cGifNwXPwFvxRplGe69cJ0daSQmKYvepMHBk6Gf6tpUkBE+c6DBiDrXVVOB3Vacm4N7fQqIss25V2OLA==; 5:3SZUkENQvom929H4MAW+a+JARoGJ00CXk7myiR9gcsYD2kcpAdolMTYJ8QQn4XSYv4xPrhwTkcK9CvmEnxJKl2wHyZPD+srpJPiJNd/3EorRJ+kHrGuhB+7vn9yhzMCJO39KHjMd8h1OC5fQfYMNmso3sgFoi4IvmJ4yqaupuJ8=; 7:mEIruvWBaL3ZZoAzGbl4Eewkclgie07qcfYfqVI+AL/E3D3CgT6AmWb09GmcwdzP/Vp5biiK19fzaQ6er6Y5EvEuNLmoAv2nUjbjEQQV38ri7VilCFesXz1d3WjKZd3qezO0Amb+qClHZ9WCG013HQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: mit.edu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2018 19:48:41.9998 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c3399440-6df2-47bd-b3f0-08d66f58f7b4 X-MS-Exchange-CrossTenant-Id: 64afd9ba-0ecf-4acf-bc36-935f6235ba8b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=64afd9ba-0ecf-4acf-bc36-935f6235ba8b; Ip=[18.9.28.11]; Helo=[outgoing.mit.edu] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR0101MB2951 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org In no-journal mode, we previously used __generic_file_fsync() in no-journal mode. This triggers a lockdep warning, and in addition, it's not safe to depend on the inode writeback mechanism in the case ext4. We can solve both problems by calling ext4_write_inode() directly. Signed-off-by: Theodore Ts'o Cc: stable@kernel.org --- fs/ext4/fsync.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 26a7fe5c4fd3..87a7ff00ef62 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c @@ -116,8 +116,16 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } + ret = file_write_and_wait_range(file, start, end); + if (ret) + return ret; + if (!journal) { - ret = __generic_file_fsync(file, start, end, datasync); + struct writeback_control wbc = { + .sync_mode = WB_SYNC_ALL + }; + + ret = ext4_write_inode(inode, &wbc); if (!ret) ret = ext4_sync_parent(inode); if (test_opt(inode->i_sb, BARRIER)) @@ -125,9 +133,6 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } - ret = file_write_and_wait_range(file, start, end); - if (ret) - return ret; /* * data=writeback,ordered: * The caller's filemap_fdatawrite()/wait will sync the data. From patchwork Mon Dec 31 19:48:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 1019704 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mit.edu Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mit.edu header.i=@mit.edu header.b="HIa/dmnp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43T7D01VfYz9sLw for ; Tue, 1 Jan 2019 06:48:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727469AbeLaTsq (ORCPT ); Mon, 31 Dec 2018 14:48:46 -0500 Received: from mail-eopbgr820113.outbound.protection.outlook.com ([40.107.82.113]:59061 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727405AbeLaTsp (ORCPT ); Mon, 31 Dec 2018 14:48:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mit.edu; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q8kUZqjzYmbB/Dy4nnDiIENN+tqWrFuJxJMN0b6jF04=; b=HIa/dmnprVUtSPyE/lugNQcmmbcclG43LkLEm8cj9tcVxLadS5MTPYfqahnXbq+aElzC/er5HbPJSJn3TDwVhxPq2YM7mnqTkm5M6Xe3eBxZTRu5QptY4eLZlXn89x/I1RC1XCcJFJXPFfU80DCAa8qCp5sQ+DjZtOgp/u2YPeg= Received: from BYAPR01CA0031.prod.exchangelabs.com (2603:10b6:a02:80::44) by SN6PR01MB4814.prod.exchangelabs.com (2603:10b6:805:d5::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Mon, 31 Dec 2018 19:48:42 +0000 Received: from BY2NAM03FT024.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::209) by BYAPR01CA0031.outlook.office365.com (2603:10b6:a02:80::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.20 via Frontend Transport; Mon, 31 Dec 2018 19:48:42 +0000 Authentication-Results: spf=pass (sender IP is 18.9.28.11) smtp.mailfrom=mit.edu; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=mit.edu; Received-SPF: Pass (protection.outlook.com: domain of mit.edu designates 18.9.28.11 as permitted sender) receiver=protection.outlook.com; client-ip=18.9.28.11; helo=outgoing.mit.edu; Received: from outgoing.mit.edu (18.9.28.11) by BY2NAM03FT024.mail.protection.outlook.com (10.152.84.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Mon, 31 Dec 2018 19:48:41 +0000 Received: from callcc.thunk.org ([104.200.153.98]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id wBVJmdGi006845 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Dec 2018 14:48:40 -0500 Received: by callcc.thunk.org (Postfix, from userid 15806) id AD3337A01D0; Mon, 31 Dec 2018 14:48:38 -0500 (EST) From: Theodore Ts'o To: Ext4 Developers List CC: Theodore Ts'o , Subject: [PATCH 3/3] ext4: track writeback errors using the generic tracking infrastructure Date: Mon, 31 Dec 2018 14:48:36 -0500 Message-ID: <20181231194836.3761-3-tytso@mit.edu> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181231194836.3761-1-tytso@mit.edu> References: <20181231194836.3761-1-tytso@mit.edu> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:18.9.28.11; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(136003)(376002)(39860400002)(346002)(396003)(2980300002)(189003)(199004)(26005)(47776003)(50226002)(26826003)(305945005)(6916009)(478600001)(8936002)(2906002)(1076003)(54906003)(8676002)(50466002)(36906005)(246002)(48376002)(106002)(75432002)(356004)(90966002)(52956003)(6266002)(42186006)(103686004)(786003)(316002)(86362001)(36756003)(2616005)(76176011)(51416003)(11346002)(126002)(476003)(5660300001)(2870700001)(4326008)(446003)(336012)(186003)(486006)(88552002)(106466001)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:SN6PR01MB4814; H:outgoing.mit.edu; FPR:; SPF:Pass; LANG:en; PTR:outgoing-auth-1.mit.edu; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT024; 1:yjfcq9KbRzeZdHMOc4MCVMAE1M3kBiqUdcLJG+XDAfzXCkfLj+imFOEtaIujri3lW0pYMeLz08/EoAZn7Sr2U8dNDq8huoVpplT7wFvj3b84t1v0kJuUX2iBMALyZ0nO X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c649b5d-3710-4499-ff1e-08d66f58f7ad X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4608076)(4709027)(2017052603328)(7153060); SRVR:SN6PR01MB4814; X-Microsoft-Exchange-Diagnostics: 1; SN6PR01MB4814; 3:6cW0jxNxK36Ecgb4LigqPnkKsUnEcNRF3ugSQ7qDGOUwq/k8J9SqAjEP9ufqlR4YCKhiEffcnKth3F5bAoCsfEve+RH0Gb1e/3JcbavJYEiDr10Q0cvwPoScjqlcComlpHRTbJsYFc8lbn0UhMwIOhmp0640kwgCLXdEET1oS5pR2Dj58S9HY932Obude5qjXAzMSPlrJuR5ZDf4skwy+LvLMvgCk1zKTSBAjZKcgWHinLkK+owedRW5eZwbGLzVfBIULLV+x5aw3m8/W7JkVwMiEbKcg2wjhIu+gEpOMR05GzvC5r+zr9+AYDXFV0CqpE/gJk5847pCnvQy6bD+rA==; 25:2b/wRWRq3hVP1K6pswaOIbB3TAEP/UPkjXVirul7+tk8KTnCvCWVEOi8X6FihQ/KAb8mkuF5tG6fu9FF1xr4TaaIOkk+5P9S9OlqGk4WJv5nqeP8gjdkFp8Tv7MGulkRWFMHrrjaUnkuR21paKOwZkvSNcD30CYTzimI1Gjvp977ae6ufQvxI9wW+PVg26/sSzTAvuf8ZoQ+jbA+R+/CmbV5Ns15vYA8zibVEeINjUbdq6kHhYuwe5ZRXIxdZLyDDRk228bmvKxxGXdm43yNXqXx/B1W/bG4tPW6AkIr2mrZuIE64NyBPY1dHJdTb0wgPxT6Z6n1oR9zpr048uekCA==; 31:G5O9rgtMlQpiS1lzbh6pfL8mMkIxMoYUt17+0XX8Meejx12vKqtSD0PKYjvcyhyRLScOKtdLPJOvIVO9wPVkE+zWDFvGJgVCsJKKzKC4+AC4ps4ZvpkaJX5kT6MjHplkwjKjZEdyW2lys4CEJRS3IlyvcbEjuLFff7t+u9EPpqjNqjshWxkBPtzClOcm+tK0yuAv9pEFoRd+MEtQcYaxG4SEvqjUyS684V0A6njOD/0= X-MS-TrafficTypeDiagnostic: SN6PR01MB4814: X-LD-Processed: 64afd9ba-0ecf-4acf-bc36-935f6235ba8b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; SN6PR01MB4814; 20:ylKXLy8yqppF6EB5IpmfIS/2o/sBYlPtSTvJcey03CS1BEB7+hP5U7gDPwceSNk6I9RYIavNbngaPLqFTmDuUU80DrmjUMYlWmC/iDYQdEpf1pR7PL623iEmYnrGhDr3jZSjxPmFLPCRIcpaHPnZDMgYYFJvpzuQML+XRJPlZPF39m4W/F5Oq8/BsTgvMwyxDVk9UcUsMkEizNz266eQJ9SD/4QiQD2X/gT17sOUu02EUjYM/8I0IIVpplqPwMkZ55i/MZ/XweUCeOiaqJAa1wYe2CE29u+rUAkxYKUZiQs/PxIdlFb2GNqMiS/QNQeZuJmcheESLLKncfT7F6lHCJwPjYQqtnUlBGzpE5ixrl2KD2F6TOhBIWO7U0IN3SJj/ouN6bbzUfLDIKbQ4omY3kOm5jQoF9lK+UDQXhWwOH27nnIM2ztax3PgqsEGJ099wZ9+GMeIz+KjUlTDa4IFO9wTdja0CSA5ge64aG7Ih2fgF7FShV7e+e+erWuJpZe8; 4:nwWFBU5m+pIjrEq+Tg5wnM4NnQUXm6jmj4hMcEwOaixQQ6KuGyC98dcV9yk2jmnRze8YQtBAsSwxijhvcWrpJPMO1BUWU+scNsTvmfQm/HD4ei8q3Y9xOb+VulJGwq75iYNu24cOroXYTyqZQ3Ok/8dm14yRfX8d/psTwhoO1Sz0aCq+o8l/+00Lt5Ti4dZAvmQaROtnH0Iu1DCemJEGZRGBsnfZnefj/22vSM7WtBgxsr+DoqXo0fHRQME3Yetgf+9kd/X4Bh1hwxAiRsuN4A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220055)(2401047)(8121501046)(3231475)(944501520)(52105112)(3002001)(10201501046)(93006095)(93004095)(6041310)(20161123562045)(201703131423095)(201702281528075)(201702281529075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:SN6PR01MB4814; BCL:0; PCL:0; RULEID:; SRVR:SN6PR01MB4814; X-Forefront-PRVS: 0903DD1D85 X-Microsoft-Exchange-Diagnostics: 1; SN6PR01MB4814; 23:JkOGQxk2eHPGCMfzbmMpSPP8fpLaUXC5YCjioNay9YofnEScTUzexzmb+TCSsZboFCLJiCDjMuQMb5Euum03FpTHnwEDu0PSHtEpwGhXrNwPjHAhp9GtoT50l7P/fNopSYnHGX8mQwEp9vASJMLT4ViR3WeOWUSbGKr6M6xwz8gfcpmv67sc/ZRsXWN+ZtXsJ+CU21vArigvOwY+F/AuxIDD6F+DTMHRHZ/BmhAJ2T40GlALQMG1xhVdqoLdep9+yo3xFqybdhImdZS+P5YMYA/WtiL2f+cx8MKLo0AzKCPiunE02Fj0VEd/8o5FMaZx3Cc1QaF9qMk3/7boeotkjEHlTSF2f5U7+qmB0iLFlSQkL5e7sd3+8IMNE6vTW1Z/HlkUKkuoKrQTWjovCkVB/xDvdGeR/0+OvQJmeiSuPp8BqT2LhayG80fHr+Jq+iqCZSGZi0vxkzbWjlzM93k2D2KPZCJ8P0JIDgGOzuV7Yp8b2/cttQRBqghcSpDqRJRNucVOgroUstgrxIM4KMrlLB9AXAjT9SRNhVYq/2xU8Hr79MGFlxB5T6xRi9wKUzI00vhMpBDklyleMUZiyio09pDmFcdCyFqJE1UgxdIFNsCAwcsiozPVV5pnuVzkFimk6+rEYMd++iraO4TvW66qFf5sAOM978OQqF48leWGRsx2W1vzEd3mRUSj8uSyuI0Zh7t49yEzyLj43hkVFT2Z9EJmu4+RRh2/iRx7yvzYeDuh1M3UI92oVdCF7kwT+/P3QCCEc0P0d97wIg5VPTXHbWeyaaNJ7cfXCWLlfnSKOEA5M7Scd5QgPPs2u86geJWavwuA8LVQ7ULrcH7qdzFonOzPogcR+DJbl2cEx6qS83q76tJJH4lvAnmhTmY9f7Y06FxRweLVTx60ra5yVvIfpHtPRBO+BzXL5rumDOjHaucUca3ONDsRt6YocbBTRjFBPx0HyhCoOiU0ZW96YC6WO7JJ+ajKT0oxlKsmG50wt7Q8occdX4l3syoiNYveuFDFrcRn0lOdBYh+4TsrJl+518gahB6m34HoZroMC7Le7pVts5IiyFXd1t6UdT7fWDxbJIdjDkiCXxwFfXJKLXibBiVQkMFCh3W8DRsLqJ79KHsDIgUeQ4gUro1dEl/RRq0Gl/lGZgwH34ygEfM0Dpa6PQ== X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: jDmyi7ha15nXThhKgZwiXF2NaRVPBF3vkUYo6WWxP9gH+RBokkZiKem9aFXqnNvkrV/N/ojM2cXYNkXZVD1dw41lEnUN1h8vjBA0BinuQEZ+nhR5HJsh4sSh81kt6kcIuSd9iadef/osY3WcMYD/Y4jp/x7ecbST8Uj9BjxEW4q+88R3jkC1leGEr+iDypUgWNrepdE/ndsvichPUAIwgxSmbWrXBIVL7gVQBUKV+iYTgdCCdRUuDT3DczRwwZmkEILDxO0q567dxzkSVlMLzZM6nZaXja5vLSkin2xMwTJQaURaM/T3R/mW0pqkBtM2 X-Microsoft-Exchange-Diagnostics: 1; SN6PR01MB4814; 6:vqEIT4Hwd7CLa0TGDOqpPKVxYkt16UJKiZEoMX9UdxIPHuofHCdg7MuhufFajbQNylOgYQ1gzQ516kB/DoftGjTPsAT66LYl40uTwN+4G8dy/PUuxcWPgRZH7mT9guLazDXPtFqXn5xQINLX1Ncj45omWI5PQlgrTtiE+V1LA6j25jivrsZi/Xt3F9NZUC/xlNVDOEJqzOi/tpI/BoX/sGb8itE5Fb7DBQajNU44KAGNtTU6Z2fhhxuypm+/lYIgNDvkWOKT+Gjrj/U3xpRagelpV0oKkHcq/VMruKiMlJr2HL7CPPCzZuVAw+rFWOe84OLZCC7sY+dlkF4Id1p0PcCAOPhmjAkRgM5nOuLwfn3LUTTm4Xu+gMNkgKLN6BjcHTLl7itytDrZ59ottX4iPAZe1yiudVyqKvfFf0Lx1amZMntvfz2tQDMDoFWRM5qp55knsQVix7F3awuPNZYQEQ==; 5:P1Z2QRebiaSlhFNOA6k/tA3v5+JUYgFKsRdes1HzTKy4dgh9YZGSr1OoilnxJZdKW7oLGMeJ9u32LsOfgw6kZspQALmxSmnOcBt+Wj37KBbrGfceTv9+WzkJ1zCG2sw7YRuZOBE47tvwQpKj7IEFKkyT2ZR0r8dso3Sq1MqwMRU=; 7:DfOKTC6YeTy50E/bKt+pcliWHBsgiVFOk2aad3B1xBdUF+0Dh0Vu44ymAD8FbBG705TervDe1g+kd3TVMHmT4x6IYdTkWLp+Gvi768cpvHk28usaEOsM7wSdfMtuAXrO9mEpjXsqSLmBxH1ywtbxhQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: mit.edu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2018 19:48:41.9710 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c649b5d-3710-4499-ff1e-08d66f58f7ad X-MS-Exchange-CrossTenant-Id: 64afd9ba-0ecf-4acf-bc36-935f6235ba8b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=64afd9ba-0ecf-4acf-bc36-935f6235ba8b; Ip=[18.9.28.11]; Helo=[outgoing.mit.edu] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR01MB4814 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org We already using mapping_set_error() in fs/ext4/page_io.c, so all we need to do is to use file_check_and_advance_wb_err() when handling fsync() requests in ext4_sync_file(). Signed-off-by: Theodore Ts'o Cc: stable@kernel.org --- fs/ext4/fsync.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 87a7ff00ef62..712f00995390 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c @@ -164,6 +164,9 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) ret = err; } out: + err = file_check_and_advance_wb_err(file); + if (ret == 0) + ret = err; trace_ext4_sync_file_exit(inode, ret); return ret; }