From patchwork Thu Feb 2 07:56:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 13125475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE79AC05027 for ; Thu, 2 Feb 2023 07:56:44 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pNUSb-0003Pj-JM; Thu, 02 Feb 2023 07:56:44 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pNUSa-0003Pd-BO for linux-f2fs-devel@lists.sourceforge.net; Thu, 02 Feb 2023 07:56:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0nCIp5n8tZD0HRjjNynsbU6tSVUGJ4HVBaDeE4Nh7xk=; b=nNMv8YevPXMZr1R8NSfRYwkdQu EBJ/9e9JxE+OnqOyMZ+j2mjnCZGnVfzA40HH2YEy0GzmCm1bXsj+KHY0MMv4uKGaF4otzwXKFLkX7 pSLJIZ+/sH8WDLKsv1oygdf06u3N6DA3AlKOa1jj9gnVX7a046JBmvHA/sVh7AAijUUk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=0nCIp5n8tZD0HRjjNynsbU6tSVUGJ4HVBaDeE4Nh7xk=; b=B gL2SCxTo1W/XOkZdq/MljcDwkCttl17KtkykJKmXI9mr9jRs5Q6J/6CYQsz+cV5HPBeAuIIpaZ+uu Rzzn8ypYll6eUM/v8xyD2dlcCX1eQdfa9xEnX552EBm9k56RkFMq/zEQf2nxRL5+7goX/X6DWnEGV XCicI/ftbr8ofTNs=; Received: from dfw.source.kernel.org ([139.178.84.217]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pNUSY-008Etp-A6 for linux-f2fs-devel@lists.sourceforge.net; Thu, 02 Feb 2023 07:56:42 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E518961883 for ; Thu, 2 Feb 2023 07:56:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D744FC433D2; Thu, 2 Feb 2023 07:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675324595; bh=dv9BqB8uztzDNyULq7HYb6Wrix1gHnGg7UunhYDeX1k=; h=From:To:Cc:Subject:Date:From; b=ISoy8oJNDFzc5m3knB8ad+XUn6zTZBwSfqU+uj9A09rAfhdjmtrIjNqh8tiY1gdWi 5aEU0iJN/wBgdgXOwZ6Oou1/wqGXz/OP/KM+Dp7DTinbQr4BpsqWNacQwCP0w6A/ZH MEl4qpCbeDIblkJCIuTQjTFaDdhPOWU9qJnXMIovQ/YPmgJaegfvJUC6sF4AIv9dvk 7nml95LwEXSGKUYDWtclHz/fXk2Vn5CD8dsDB+HFliWEOHa2s5fg/KbkqFSDY7LCJw FVB+qi2rTtjKOrAuIeTAZ16SoMeOBQDpoJIkmnFXRVe/EZM2SdHEqSSJ8jFLQuP+FG 9gHhm6NfJa0eA== From: Chao Yu To: jaegeuk@kernel.org Date: Thu, 2 Feb 2023 15:56:25 +0800 Message-Id: <20230202075625.3512623-1-chao@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Headers-End: 1pNUSY-008Etp-A6 Subject: [f2fs-dev] [PATCH] fsck.f2fs: relocate chksum verification step during f2fs_do_mount() X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-f2fs-devel@lists.sourceforge.net Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Keep sanity_check_raw_super flow in fsck.f2fs being consistent w/ sanity_check_raw_super() in f2fs kernel module, otherwise, it outputs different error information when mounting/fscking the same image which contains corrupted superblock. Signed-off-by: Chao Yu --- fsck/mount.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fsck/mount.c b/fsck/mount.c index 25b7f3b..2a87759 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -866,16 +866,16 @@ int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr) unsigned int segment_count, segs_per_sec, secs_per_zone, segs_per_zone; unsigned int total_sections, blocks_per_seg; - if ((get_sb(feature) & F2FS_FEATURE_SB_CHKSUM) && - verify_sb_chksum(sb)) - return -1; - if (F2FS_SUPER_MAGIC != get_sb(magic)) { MSG(0, "Magic Mismatch, valid(0x%x) - read(0x%x)\n", F2FS_SUPER_MAGIC, get_sb(magic)); return -1; } + if ((get_sb(feature) & F2FS_FEATURE_SB_CHKSUM) && + verify_sb_chksum(sb)) + return -1; + blocksize = 1 << get_sb(log_blocksize); if (F2FS_BLKSIZE != blocksize) { MSG(0, "Invalid blocksize (%u), supports only 4KB\n",