From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517180722-2-16409049793689119327 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180721; b=EAR2tcf5CTQFSUI6VGZwXVCBsVTb1fKDWa8deHA650NeBQa d7JciVrJBH/zNO33LkRB/Wz0fsxL1ZkUdp0NF5il8S8OEiaMjTCFHgYvNT7HaecL RSK7MtI1kospSu/t8ZXS8Fh3Whzb1wykOlIL7kyrfvIewCqDKEMuBprdIHb+Oaqu smuB2VXDM6M7t6FwvKv0qzKzq3H8uWwx8neWjgA9vLPQEzJKo3Og+Bdt4QIGtxJi kzIdYu8nGC+V3sHOoT3GwrPiHBk48D6u04zk+vyByiAkzZ/fj7vj7WBHC9ShZdAm GiGwdoD+LBQlAQwICbXgCAVPB9+yTiGyFw+j2Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180721; bh=lMqZLU CnFFP8ukzQyVSDrEIXjGXYi7BghQ9UcRTbqv4=; b=Mkn/9uxCXbevmdBshzFCzy 3B78j/inJ870TcIcSngwStxoaTkPaEvhprZZP5nNE2H6DGKtHR68QdNeRs7OXZwy /U6ouunaxbseuYq5pKd4eDx2VjbgHIjgWBdi3h9V1eTKnyzOHFwBakDjPT1pyN3D IyW++rrTLCyo6HZxE56hIfcl3BiunJbrYKYYXQ386wtOZna+nkrVYJUEmtulDrhc DEFlFqqlIcQN/8eexPMn5j8f0sLPTt6tlSw7RaUE8BnoHDUbigkNV1fBllxkjkO0 tP8r3UPzvtc2IUFCVJrVvTVzMo8e+4k6P3cKziqh4uCiCBu38DxokehEUkO2HL9w == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=JH7TVbPM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=JH7TVbPM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754022AbeA1XE5 (ORCPT ); Sun, 28 Jan 2018 18:04:57 -0500 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:46538 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752934AbeA1W1g (ORCPT ); Sun, 28 Jan 2018 17:27:36 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Omar Sandoval , David Sterba , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.14 063/100] Btrfs: disable FUA if mounted with nobarrier Thread-Topic: [PATCH AUTOSEL for 4.14 063/100] Btrfs: disable FUA if mounted with nobarrier Thread-Index: AQHTmIcRwaeWFGqvB0Kn5CPedOd6Eg== Date: Sun, 28 Jan 2018 22:26:40 +0000 Message-ID: <20180128222547.7398-63-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1034;7:UnvAGFvPoBjOBQ+d2Rh7AoXzOm3CroY/x/xRciPEbL3O17kR6KoaiplDIXGc9rtRiz0oHf6tk6Vax8ZyJtzq60Mx4/8G3VOXSfCUpu8j9h+p8z7NKbpAC+grpOhbbtUh9kVqk1CmhsNbZWUTbxbfb9LSLwg+XQfE56DBjrMeg6Yh05bNKEJ4I0eaPOLb/BavB3gwXnxC7/1zkJfUxvYNrSVkFFvGtehCd3AU2h6SGu7jVxNwBAKpuooRS/qwAZoQ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d3988bcc-fdc3-46ae-44ff-08d5669e53db x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(67672495146484); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(6666003)(86612001)(36756003)(6486002)(575784001)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(68736007)(478600001)(81166006)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: T/vfyuTAr/SoJHi9xPQjJor9KWEGGOPcOQ0jYxjp3yTQy/qPRt64gSUflqm0DiEp+/T/MUbdCvIwHaSMswKRjQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3988bcc-fdc3-46ae-44ff-08d5669e53db X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:40.2274 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Omar Sandoval [ Upstream commit 1b9e619c5bc8235cfba3dc4ced2fb0e3554a05d4 ] I was seeing disk flushes still happening when I mounted a Btrfs filesystem with nobarrier for testing. This is because we use FUA to write out the first super block, and on devices without FUA support, the block layer translates FUA to a flush. Even on devices supporting true FUA, using FUA when we asked for no barriers is surprising. Fixes: 387125fc722a8ed ("Btrfs: fix barrier flushes") Signed-off-by: Omar Sandoval Reviewed-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/disk-io.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index dfdab849037b..167ce43cabe8 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3391,6 +3391,7 @@ static int write_dev_supers(struct btrfs_device *devi= ce, int errors =3D 0; u32 crc; u64 bytenr; + int op_flags; =20 if (max_mirrors =3D=3D 0) max_mirrors =3D BTRFS_SUPER_MIRROR_MAX; @@ -3433,13 +3434,10 @@ static int write_dev_supers(struct btrfs_device *de= vice, * we fua the first super. The others we allow * to go down lazy. */ - if (i =3D=3D 0) { - ret =3D btrfsic_submit_bh(REQ_OP_WRITE, - REQ_SYNC | REQ_FUA | REQ_META | REQ_PRIO, bh); - } else { - ret =3D btrfsic_submit_bh(REQ_OP_WRITE, - REQ_SYNC | REQ_META | REQ_PRIO, bh); - } + op_flags =3D REQ_SYNC | REQ_META | REQ_PRIO; + if (i =3D=3D 0 && !btrfs_test_opt(device->fs_info, NOBARRIER)) + op_flags |=3D REQ_FUA; + ret =3D btrfsic_submit_bh(REQ_OP_WRITE, op_flags, bh); if (ret) errors++; } --=20 2.11.0