From: Darrick J. Wong <djwong@kernel.org>
Date: Fri, 23 Feb 2024 05:48:17 +0000 (-0800)
Subject: xfs: fix log recovery erroring out on refcount recovery failure
X-Git-Tag: v6.9-rc1~129^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e5efd72a29e6d2aa70b0219f1786834ad14d005;p=thirdparty%2Fkernel%2Flinux.git

xfs: fix log recovery erroring out on refcount recovery failure

Per the comment in the error case of xfs_reflink_recover_cow, zero out
any error (after shutting down the log) so that we actually kill any new
intent items that might have gotten logged by later recovery steps.
Discovered by xfs/434, which few people actually seem to run.

Fixes: 2c1e31ed5c88 ("xfs: place intent recovery under NOFS allocation context")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
---

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index cd134830a695a..13f1d2e915405 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3532,6 +3532,7 @@ xlog_recover_finish(
 		 * and AIL.
 		 */
 		xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);
+		error = 0;
 		goto out_error;
 	}