From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1C9D381AFA for ; Mon, 23 Mar 2026 08:38:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774255122; cv=none; b=i6C2K5p8ZtTqvP4aLIYwSoNyIbtMKT/Pb0JvmEazN0BNQWTWhnHgy+x28JCAeFJKHWn5XAGl/kjPMAQIURbrRFG80hRIvuvWvYlfdt1JDL1S4Fc6G4+3k8NEyP0cngGUz20ok0CCy/+7IBKolvwVbFXY9c15kFkMM2JrdUjcEJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774255122; c=relaxed/simple; bh=+zKOpcvSNYbdWl4TdDFXpsye2s5dDcbGfsO3Gb4Qv38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mb2/lH4vxkWHpALlSUsdnQG3d3zHhdvjDs0htynSzvgUuU1dVu5ZWi1eyjkiIonor/e7hCBnsIUDbZaZ77UkaXk8yJk9EtAiWDN3Y4+O2Xxrr+MCQ3hCb53oOsNT46HdAsxL85tsKXfYuZH5S/pef6S3W6+ZPAZIkI2dIQHXLSw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I1YsDq/m; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I1YsDq/m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCBCFC2BCB0; Mon, 23 Mar 2026 08:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774255121; bh=+zKOpcvSNYbdWl4TdDFXpsye2s5dDcbGfsO3Gb4Qv38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I1YsDq/m8ph7ozk2XOVINzZ8f8ApWlnBuzEhYJfTZzYieNRmkwr9ML+b4CvcYhcmr N8/2ptm2XPe+xjux1npLiePjNbHz9wpPql6x9AdQmzTNBi3O+afWsUJw0Cwfw3dDV4 wrZKod+82aJBcq7Sw5+Wjp0Paw+B2MZZwbvG2y66JErIEdCKzO0CTjjEX1zgkvW3MU eM0nAz5+IBhs7u2Xp0mIgkZRBqK8pHraFoB3uYgPNOix4Up49bV1gr1FqdmIuSyNLT Y7TdYe7O8ONbwtRfRjI9OONZHyU8Wm6VVJWAGMvkTcgx1vnwBpFgLrn7N66g9+bc0o GBkXhK3tpv9kA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v3 2/2] f2fs: use more generic f2fs_stop_checkpoint() Date: Mon, 23 Mar 2026 16:38:33 +0800 Message-ID: <20260323083834.156393-2-chao@kernel.org> X-Mailer: git-send-email 2.53.0.959.g497ff81fa9-goog In-Reply-To: <20260323083834.156393-1-chao@kernel.org> References: <20260323083834.156393-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Let's use more generic f2fs_stop_checkpoint() instead of f2fs_handle_critical_error() to handle critical error in f2fs. Signed-off-by: Chao Yu --- v3: This patch depends on "f2fs: call f2fs_handle_critical_error() to set cp_error flag", so send it as a patchset. fs/f2fs/checkpoint.c | 9 --------- fs/f2fs/f2fs.h | 3 +-- fs/f2fs/node.c | 2 +- fs/f2fs/super.c | 13 ++++++++++++- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 6dd39b7de11a..01e1ba77263e 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -232,15 +232,6 @@ static inline void f2fs_unlock_all(struct f2fs_sb_info *sbi) static struct kmem_cache *ino_entry_slab; struct kmem_cache *f2fs_inode_entry_slab; -void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io, - unsigned char reason) -{ - f2fs_build_fault_attr(sbi, 0, 0, FAULT_ALL); - if (!end_io) - f2fs_flush_merged_writes(sbi); - f2fs_handle_critical_error(sbi, reason); -} - /* * We guarantee no failure on the returned page. */ diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 94cf1e78d892..247eae5eb83b 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3905,7 +3905,6 @@ int f2fs_do_quota_sync(struct super_block *sb, int type); loff_t max_file_blocks(struct inode *inode); void f2fs_quota_off_umount(struct super_block *sb); void f2fs_save_errors(struct f2fs_sb_info *sbi, unsigned char flag); -void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason); void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error); int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover); int f2fs_sync_fs(struct super_block *sb, int sync); @@ -5090,7 +5089,7 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, f2fs_bug_on(sbi, 1); return; } - f2fs_handle_critical_error(sbi, stop_reason); + f2fs_stop_checkpoint(sbi, false, stop_reason); } } else { sbi->page_eio_ofs[type] = ofs; diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 17eab01ae8f9..0de41526f28a 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1779,7 +1779,7 @@ static bool __write_node_folio(struct folio *folio, bool atomic, bool *submitted if (f2fs_sanity_check_node_footer(sbi, folio, nid, NODE_TYPE_REGULAR, false)) { - f2fs_handle_critical_error(sbi, STOP_CP_REASON_CORRUPTED_NID); + f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_CORRUPTED_NID); goto redirty_out; } diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index bd9785a3c805..5b552f08fe7b 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4663,7 +4663,8 @@ static bool system_going_down(void) || system_state == SYSTEM_RESTART; } -void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason) +static void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, + unsigned char reason) { struct super_block *sb = sbi->sb; bool shutdown = reason == STOP_CP_REASON_SHUTDOWN; @@ -4720,6 +4721,16 @@ void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason) */ } +void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io, + unsigned char reason) +{ + f2fs_build_fault_attr(sbi, 0, 0, FAULT_ALL); + if (!end_io) + f2fs_flush_merged_writes(sbi); + f2fs_handle_critical_error(sbi, reason); +} + + static void f2fs_record_error_work(struct work_struct *work) { struct f2fs_sb_info *sbi = container_of(work, -- 2.49.0