From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B58ECDB465 for ; Mon, 16 Oct 2023 07:37:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232282AbjJPHhv (ORCPT ); Mon, 16 Oct 2023 03:37:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232087AbjJPHht (ORCPT ); Mon, 16 Oct 2023 03:37:49 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EED6EE1 for ; Mon, 16 Oct 2023 00:37:47 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55D3BC433C7; Mon, 16 Oct 2023 07:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697441867; bh=FNzUTuBfzvrUXizLUlXqjLaF57+7wKA7RX7E+mW/uVs=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=uKl0gLR5aCbqsy4jq6YSzWsz0n0y3ptbS/D2PUkZCXzkW5lCvAgKT5xJGgGtLFDpp +7/na5QhVIk2t4dW+6d6Ea59iUAk6ISccysTCRNKY6YWrTFAKrn/57mMhBwLGAUXaS u7VXdfIEOmLEbPfGnbZYZ4EsqtyqBgn1lZEm5BAV1+CGwHbG4SHVRfkAF1QnHjDsL5 8IJYpd+qDzrHEYprTR5s+kA/B/j99qxa2b6eJr1vSXoMfmg8z9039dTN2+/GjHmm7m GMBGUt3pdt8BFGmET8k68JAeq2WLxFU2pzDzReA/pOq6Bo5egaObVUKQjgZ0p8UB7n GFCxhJ2h4Mhag== Message-ID: <1880a7c4-9ab9-8e6d-f1d4-c2172a99685c@kernel.org> Date: Mon, 16 Oct 2023 15:37:43 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: [PATCH] f2fs: fix error path of __f2fs_build_free_nids Content-Language: en-US To: Zhiguo Niu , jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, niuzhiguo84@gmail.com References: <1697194703-21371-1-git-send-email-zhiguo.niu@unisoc.com> From: Chao Yu In-Reply-To: <1697194703-21371-1-git-send-email-zhiguo.niu@unisoc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023/10/13 18:58, Zhiguo Niu wrote: > SBI_NEED_FSCK should be set for fsck has a chance to > repair in case of scan_nat_page fail in run time. > > Signed-off-by: Zhiguo Niu Hi Zhiguo, Can you please check below update? From 9a3459d2d62a12f8708d72aa7808a1def9f9d92f Mon Sep 17 00:00:00 2001 From: Zhiguo Niu Date: Fri, 13 Oct 2023 18:58:23 +0800 Subject: [PATCH] f2fs: fix error path of __f2fs_build_free_nids If NAT is corrupted, let scan_nat_page() return EFSCORRUPTED, so that, caller can set SBI_NEED_FSCK flag into checkpoint for later repair by fsck. Also, this patch introduces a new fscorrupted error flag, and in above scenario, it will persist the error flag into superblock synchronously to avoid it has no luck to trigger a checkpoint to record SBI_NEED_FSCK. Signed-off-by: Zhiguo Niu Signed-off-by: Chao Yu --- fs/f2fs/node.c | 11 +++++++++-- include/linux/f2fs_fs.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index a2b2c6c7f66d..57d9dd3a43bc 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -2389,7 +2389,7 @@ static int scan_nat_page(struct f2fs_sb_info *sbi, blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr); if (blk_addr == NEW_ADDR) - return -EINVAL; + return -EFSCORRUPTED; if (blk_addr == NULL_ADDR) { add_free_nid(sbi, start_nid, true, true); @@ -2504,7 +2504,14 @@ static int __f2fs_build_free_nids(struct f2fs_sb_info *sbi, if (ret) { f2fs_up_read(&nm_i->nat_tree_lock); - f2fs_err(sbi, "NAT is corrupt, run fsck to fix it"); + + if (ret == -EFSCORRUPTED) { + f2fs_err(sbi, "NAT is corrupt, run fsck to fix it"); + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_handle_error(sbi, + ERROR_INCONSISTENT_NAT); + } + return ret; } } diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h index 07ed69c2840d..039fe0ce8d83 100644 --- a/include/linux/f2fs_fs.h +++ b/include/linux/f2fs_fs.h @@ -104,6 +104,7 @@ enum f2fs_error { ERROR_CORRUPTED_VERITY_XATTR, ERROR_CORRUPTED_XATTR, ERROR_INVALID_NODE_REFERENCE, + ERROR_INCONSISTENT_NAT, ERROR_MAX, }; -- 2.40.1