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 50476C369C2 for ; Fri, 25 Apr 2025 11:42:05 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1u8HRT-0001op-Rn; Fri, 25 Apr 2025 11:42:03 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1u8HRL-0001oi-T9 for linux-f2fs-devel@lists.sourceforge.net; Fri, 25 Apr 2025 11:41:55 +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=c1GO8xX8SeHDni7YMOyWY9dy2vWmXORpNa0JQm+oc90=; b=TNr8v41IIg76o2Ppf3g0P2sWi3 Yaky2EQsI3F2oPiAJCSfyHpJiCLjfKljJgFFAvMAYjKk32HkpH9ofXKhpkeWZpwc2fvNrnUg3wYu9 gv8ZWM5v9fRJbe8C4vC3WCyT0+mlK2bYx05gjyiH+pTYqJSrC2mH5TSqzj4F5tFXPP+o=; 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=c1GO8xX8SeHDni7YMOyWY9dy2vWmXORpNa0JQm+oc90=; b=i ypBWVIqDP+EIRLwAQ4Iui52q88r7nt3umWknijIinWQhQooWy0fZh2Sxm5v4b6MWRQXqZF466R2Nd E6Y+86uc3xejWnKwOmQXNP8qQ5uAEWz45aRk/c7sMYylKbTC8XjgDrmwFw1XhlJ+q3Ng/LMdw/lhw oB7U+K55QNYr8BqU=; Received: from tor.source.kernel.org ([172.105.4.254]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1u8HR5-0001Jq-Kc for linux-f2fs-devel@lists.sourceforge.net; Fri, 25 Apr 2025 11:41:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 826C76847C; Fri, 25 Apr 2025 11:41:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E552C4CEE4; Fri, 25 Apr 2025 11:41:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745581288; bh=uDXxJYc56TwpHhSUDTQzS9LnUzle6oNdFUyHlC7Ibik=; h=From:To:Cc:Subject:Date:From; b=bn2rD6b7SOtBlPPKZOUHvr23uSS6SOTqXMv1idXxa/JgX5Cqzw8aUe2lbz43JJRXI E8DYflojNIuc1Fi1itt0bSC6qUg1ee4845paqcnNOr6P1cogEr6kf7OoiWCcp6JTXe e58B/QIAC2KH+JQw10TFgKsZdv/pBdVgjziNwdQpgBudk44pH0UPT8UsnTd/aZutBo UxveR/zbiBDkSgzbngXvyCY8CTD9uJqdKGApDoL0LvKOiPhxW43qmN3JjkSOeAyyYS jA5SPBUuGvpOFr3soKmiAwF00RsmBpku0EGNYXAOdVc87TkcRBhFc1+AR8DTpvGUex n0Mjfpl8fNIQg== To: jaegeuk@kernel.org Date: Fri, 25 Apr 2025 19:41:18 +0800 Message-ID: <20250425114118.1161798-1-chao@kernel.org> X-Mailer: git-send-email 2.49.0.901.g37484f566f-goog MIME-Version: 1.0 X-Headers-End: 1u8HR5-0001Jq-Kc Subject: [f2fs-dev] [PATCH v2] fsck.f2fs: tune linear_lookup in 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: , From: Chao Yu via Linux-f2fs-devel Reply-To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net In order to avoid failing to tune linear_lookup if auto or preen mode is on. Cc: Daniel Lee Signed-off-by: Chao Yu --- v2: - remove unneeded f2fs_fs.h - remove unneeded "\n" fsck/fsck.c | 20 +++++++++----------- fsck/main.c | 2 -- fsck/mount.c | 2 ++ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/fsck/fsck.c b/fsck/fsck.c index 2cff33f..9cbe5db 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -2369,26 +2369,24 @@ void fsck_update_sb_flags(struct f2fs_sb_info *sbi) struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); u16 flags = get_sb(s_encoding_flags); - if (c.nolinear_lookup == LINEAR_LOOKUP_DISABLE) { + if (c.nolinear_lookup == LINEAR_LOOKUP_DEFAULT) { + INFO_MSG("Casefold: linear_lookup [%s]", + get_sb(s_encoding_flags) & F2FS_ENC_NO_COMPAT_FALLBACK_FL ? + "disable" : "enable"); + } else if (c.nolinear_lookup == LINEAR_LOOKUP_DISABLE) { if (!(flags & F2FS_ENC_NO_COMPAT_FALLBACK_FL)) { flags |= F2FS_ENC_NO_COMPAT_FALLBACK_FL; set_sb(s_encoding_flags, flags); - c.fix_on = 1; - c.invalid_sb |= SB_ENCODE_FLAG; - INFO_MSG("Casefold: disable linear lookup\n"); + INFO_MSG("Casefold: disable linear lookup"); + update_superblock(sbi->raw_super, SB_MASK_ALL); } } else if (c.nolinear_lookup == LINEAR_LOOKUP_ENABLE) { if (flags & F2FS_ENC_NO_COMPAT_FALLBACK_FL) { flags &= ~F2FS_ENC_NO_COMPAT_FALLBACK_FL; set_sb(s_encoding_flags, flags); - c.fix_on = 1; - c.invalid_sb |= SB_ENCODE_FLAG; - INFO_MSG("Casefold: enable linear lookup\n"); + INFO_MSG("Casefold: enable linear lookup"); + update_superblock(sbi->raw_super, SB_MASK_ALL); } - } else { - INFO_MSG("Casefold: linear_lookup [%s]\n", - get_sb(s_encoding_flags) & F2FS_ENC_NO_COMPAT_FALLBACK_FL ? - "disable" : "enable"); } } diff --git a/fsck/main.c b/fsck/main.c index cb51673..2d968a8 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -1004,8 +1004,6 @@ static int do_fsck(struct f2fs_sb_info *sbi) F2FS_FT_DIR, TYPE_INODE, &blk_cnt, &cbc, &child); fsck_chk_quota_files(sbi); - fsck_update_sb_flags(sbi); - ret = fsck_verify(sbi); fsck_free(sbi); diff --git a/fsck/mount.c b/fsck/mount.c index 08b2687..a7f16e7 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -4117,6 +4117,8 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi) update_superblock(sbi->raw_super, SB_MASK_ALL); } #else + fsck_update_sb_flags(sbi); + if (!c.no_kernel_check) { u32 prev_time, cur_time, time_diff; __le32 *ver_ts_ptr = (__le32 *)(sbi->raw_super->version -- 2.49.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel