From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3992186-1523243946-2-18119659878136795620 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.25, MAILING_LIST_MULTI -1, 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=fm2; t= 1523243945; b=XWkWLuNO9yvEa5DZJLtxPIhJU3vs+8ISNoK/CJ4qgczjTndPgp IsA8oFUorAfSZVxCwdo2OPJA1rF/K+K5kUtgX/++8KudsS5iWkGF5GFmMN8hHvsA JSJZ93tNGeEbKGitY2+Y9ZuHMCAOG+xkv49ZXWLLIDPKIT+Vg5N90FvZJa5prVJp fW0U752rkMt+guf5LhkZgvWVcPoOOzpuPKnDGnrNhpmdS8ajD8RTtbJrJx27hqPP SOi++rXBvrlKm34zBZWcAoqUqgO+y6g9/grP93qH3dGR4Rpt87Rj3YefhwRSgVtu Y4ljCE2sIP9elS2VruWqwvjB2PozjhtFywuQ== 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=fm2; t=1523243945; bh=nIzuqi4tgt SdMOL+Zm7Ww4nxJychdwpl9BSS0htazYY=; b=WecEFa5/hGJbbpIh2JyABlJoXY lTXjtUpZjnYVPuVlzCQqaHpW6fEEVf1bG7J3r47ndu2uRx3+LLxd2AsTKpLzQt4D WRlSruDf5qm45mFgQD4ZeyZe375eXInhBTWN+N7Poa4B/kU+wtKLUyziVCtACG5e b9+/o/h3Af0nCThXBCxyqTwT09i83sGT1035Q4lty2OgIYm6nhu/nBHfZX+genYM K7OD4Ow0Q+gj/jQHAy4Q/eMcGBdZFa7gotoZf7EfNqZlUlgmmhPajTqJbXudqOKb OLdSG1GDDoxcb+X4P6cKnAKYwb1ysYNpBYxp6Ie+asyt+fZyJMnbOMLaRpPg== 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=kwvLrHRL 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-cm=none score=0; 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; x-vs=clean score=-100 state=0 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=kwvLrHRL 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-cm=none score=0; 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; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfGnW7/rRyP7h+839iFHIf13FDdWvGPbky8F6jKV6rL8hVixitkwKm6QZNSX8QE6mx8248cQOYKbAC5GyASBh6+hKztbHtYrtxh62psK5+DqKl3gPlkSf oJjloILMF+tVpUfS69Dk421Mr/dXlh7nS0J9x841ao3C5RNVYT6lhuLdZV3kW/iQwEALqyNEqJiOOQ4jNuHbH0QzuL169M3VVs3Afe8NgDzNb4hY+C9IRpFF X-CM-Analysis: v=2.3 cv=Tq3Iegfh c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=yPCof4ZbAAAA:8 a=iox4zFpeAAAA:8 a=yMhMjlubAAAA:8 a=CayBMKeuEvu4Z8dvqTcA:9 a=wPNLvfGTeEIA:10 a=WzC6qhA0u3u7Ye7llzcV:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752737AbeDIDSr (ORCPT ); Sun, 8 Apr 2018 23:18:47 -0400 Received: from mail-bn3nam01on0095.outbound.protection.outlook.com ([104.47.33.95]:56127 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753918AbeDIAXc (ORCPT ); Sun, 8 Apr 2018 20:23:32 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Anand Jain , Anand Jain , David Sterba , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 054/161] btrfs: fail mount when sb flag is not in BTRFS_SUPER_FLAG_SUPP Thread-Topic: [PATCH AUTOSEL for 4.14 054/161] btrfs: fail mount when sb flag is not in BTRFS_SUPER_FLAG_SUPP Thread-Index: AQHTz5iRI1Ee4Gxi7UiBbb/Rw9TUBA== Date: Mon, 9 Apr 2018 00:20:30 +0000 Message-ID: <20180409001936.162706-54-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-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;DM5PR2101MB1014;7:8ypvQFrizc6Otu0YWjbOyL4EuRf6nY54Ipt2oKi4cBCuf3tvvaZEILhHEAOccRMzxfM0fxUcC2cdut38P2k/hQuXvrCsI2rEf1dSc0K6Ato5xmSZXGsv0jzjwFASAGM5onvrTfyJm4I9OZwcpFmPv8rMUgO7UdY3MtrnV8Y/mzCSULdUWAjRsOcUJLlp7QPUsnGsQKds9XI7Y9aoFaZ2ZfJT8JaLI+sNtTVId4R8LMryE8YJUZozg2WCiThPaaxe;20:8pD2VwATDDHzxsDKB5NG7/QcgdytsbJ68Lt6+ckYQDDMqEFgaHDB6nNjpPhlxhtVjgiOvyZ8emZ4vL+6QOll4BY44TgD6jAP5JwOVjQqbytoLP4fk+ZEb0xDd5ssXZ6IXBAVE3mr/z4eyzXypwjW2CUCuhvLsdQQ+iogMwEa04Q= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: da98eabb-da1e-4e33-3da5-08d59db01eb1 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB1014; x-ms-traffictypediagnostic: DM5PR2101MB1014: 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)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1014;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1014; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39860400002)(39380400002)(396003)(376002)(189003)(199004)(81166006)(81156014)(478600001)(6436002)(72206003)(575784001)(8936002)(10290500003)(106356001)(99286004)(86362001)(2616005)(7736002)(2501003)(6666003)(446003)(476003)(8676002)(11346002)(105586002)(305945005)(5250100002)(6512007)(53936002)(68736007)(107886003)(66066001)(86612001)(2906002)(14454004)(186003)(22452003)(25786009)(4326008)(2900100001)(486006)(36756003)(6486002)(3660700001)(59450400001)(54906003)(26005)(3280700002)(110136005)(1076002)(10090500001)(76176011)(6506007)(97736004)(316002)(3846002)(6116002)(102836004)(5660300001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1014;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: Ry6fGpHypfalGBrMMzGwqsybKR0WuKdEByGXiRyw4ye8p59vduK+uosR0rQrLG5C3YCzcH6f0+kfITB48RTekAJa/UEatyAiQyuMzwJTQlVgLWd/S1ZtLn4ACmpPx8bdwV7v9E6f6oHVB/k7HONE8qa45LTuD0/hAzZqMi0V0wikftXDIfye/6mmgNCgckhezkq6BzOeALmTxmWS8vjkJdeWLaTFHu/vQ/DUqyZEgXV9dw4GKye4YZ90zrE+7gdNrIeVwdBmtFv3WJSqsR6LMkLSpXjTC77drQ1liqh3oT7Rv9MVC50g6+evdzJo8EfA8gsU8YL5ypdbNzZloCl/I4CTME9uamJn8FNwvttrqxrzp3KYdIqlqEOQsuQa4z0dHAV4EBqamNS7YPpFiKj+QrP5PnMfWPQlPuksv4v2Wxc= 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: da98eabb-da1e-4e33-3da5-08d59db01eb1 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:20:30.4255 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1014 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: Anand Jain [ Upstream commit 6f794e3c5c8f8fdd3b5bb20d9ded894e685b5bbe ] It appears from the original commit [1] that there isn't any design specific reason not to fail the mount instead of just warning. This patch will change it to fail. [1] commit 319e4d0661e5323c9f9945f0f8fb5905e5fe74c3 btrfs: Enhance super validation check Fixes: 319e4d0661e5323 ("btrfs: Enhance super validation check") Signed-off-by: Anand Jain Reviewed-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/disk-io.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 167ce43cabe8..79f0f282a0ef 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -4063,9 +4063,11 @@ static int btrfs_check_super_valid(struct btrfs_fs_i= nfo *fs_info) btrfs_err(fs_info, "no valid FS found"); ret =3D -EINVAL; } - if (btrfs_super_flags(sb) & ~BTRFS_SUPER_FLAG_SUPP) - btrfs_warn(fs_info, "unrecognized super flag: %llu", + if (btrfs_super_flags(sb) & ~BTRFS_SUPER_FLAG_SUPP) { + btrfs_err(fs_info, "unrecognized or unsupported super flag: %llu", btrfs_super_flags(sb) & ~BTRFS_SUPER_FLAG_SUPP); + ret =3D -EINVAL; + } if (btrfs_super_root_level(sb) >=3D BTRFS_MAX_LEVEL) { btrfs_err(fs_info, "tree_root level too big: %d >=3D %d", btrfs_super_root_level(sb), BTRFS_MAX_LEVEL); --=20 2.15.1