Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp10644536ybi; Thu, 25 Jul 2019 02:59:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJp3Om7us9Xb2wZlPZpzjn45GZr2p09yXC/ycnbloAbzUSDQewkbh9SWFTt765gkheOa90 X-Received: by 2002:a63:f50d:: with SMTP id w13mr85383827pgh.411.1564048787806; Thu, 25 Jul 2019 02:59:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564048787; cv=none; d=google.com; s=arc-20160816; b=VyQFxEIrow4NiHj/rRQNPWsb6Pru0Cwu4L2ATWcQX0LYJU0YD7AWcgNVF0IcymmWe4 fHjcl/tssXY5Lfm2qdcybKGLvRESOnVyJ7mVI8vKrmSqqzJdrrn9FuhByppkfczSOZIC zPJMO1LG2jglaiOSDl5MszszAa76PCSFmQt3FcSvdLG4RpcTc7VjtTXlWLZvP80vFwV6 MUpW53nhtpl4FvvG2zdDh/Z5yso/QYezQt7pL0rozYohKg9jx1IstD0uwpTRX3ctH2Zg OSLw0uX1Ttlf3/Tsc+z85lkOwPpqIpHRuncgSVMB783d5nq6t4urcl1/QJVOeM4rz/7O 112Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=4kCAnAX5CNR55RcRwWvkKgkaY840pX0gzLbTRWFZ8+A=; b=plSh+H7WuQ2aUm1Jm9CAPrqg3JxyreV3HaUIF9CS6WZIqkNZIpzNG4d1j1dAYlz1+c VHyDn38T4Woymso+iEluB/f3B1nsfPvzNQt7L31j/ogj3eplqcXmk6PjLmX/gJK/ctiw pLcBQDFAWlVkNaOXkj2sTsd5izG6+W/fEa8XUybJdjDXmw4iOysDseejcq4pMBgIJorZ pMASyVK6Jh+tr9lzYE5r/h/lPT725CbpmIas3Ru7xiyhofnI33UfB2UENJh4oBsAx9cJ eonHOiTAmoIQjR9HbpU1eRisDKW1DBtkuWNT6/BQVgKA8m5ylh2SX4lpBs5Wy5p+BwdI Ry2A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b92si15013375pjc.17.2019.07.25.02.59.29; Thu, 25 Jul 2019 02:59:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389294AbfGYCmX (ORCPT + 99 others); Wed, 24 Jul 2019 22:42:23 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2718 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2389268AbfGYCmX (ORCPT ); Wed, 24 Jul 2019 22:42:23 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 92F071EC6B027ABCF126; Thu, 25 Jul 2019 10:42:21 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.209) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 25 Jul 2019 10:42:19 +0800 Subject: Re: [PATCH] f2fs: use EINVAL for invalid superblock To: Icenowy Zheng , Jaegeuk Kim CC: , References: <20190724130656.29436-1-icenowy@aosc.io> From: Chao Yu Message-ID: Date: Thu, 25 Jul 2019 10:42:18 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190724130656.29436-1-icenowy@aosc.io> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Icenowy, Yes, I can see that mount_block_root() calls ksys_mount(), however it handles 0, EACCES and EINVAL error code..., but as manual of mount(2) said that there are lots of error number it can return, so I suggest we'd better fix below error handling. int err = do_mount_root(name, p, flags, root_mount_data); switch (err) { case 0: goto out; case -EACCES: case -EINVAL: continue; } In another point, I agreed that we should not just return -EFSCORRUPTED for all failure cases of sanity_check_raw_super(), EINVAL should be returned correctly if the filesystem magic number is not f2fs' one, and EFSCORRUPTED for the other cases. Thanks, On 2019/7/24 21:06, Icenowy Zheng wrote: > The kernel mount_block_root() function expects -EACESS or -EINVAL for a > unmountable filesystem when trying to mount the root with different > filesystem types. > > However, in 5.3-rc1 the behavior when F2FS code cannot find valid block > changed to return -EFSCORRUPTED(-EUCLEAN), and this error code makes > mount_block_root() fail when trying to probe F2FS. As invalid > superblocks mean the filesystem cannot be recognized as F2FS (it might > be another FS), returning -EINVAL seems more reasonable, and other > filesystems also do this. > > Change back the return value to -EINVAL when no valid superblocks are > found. > > Fixes: 10f966bbf521 ("f2fs: use generic EFSBADCRC/EFSCORRUPTED") > Signed-off-by: Icenowy Zheng > --- > This commit fixes a regression introduced in v5.3-rc1, which leads to > btrfs / cannot be mounted if no initrd is used and both f2fs and btrfs > are built-in. > > fs/f2fs/super.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 6de6cda44031..949309b9f1b8 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -2873,7 +2873,7 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi, > if (sanity_check_raw_super(sbi, bh)) { > f2fs_err(sbi, "Can't find valid F2FS filesystem in %dth superblock", > block + 1); > - err = -EFSCORRUPTED; > + err = -EINVAL; > brelse(bh); > continue; > } >