xfs: fix log recovery erroring out on refcount recovery failure

Darrick J. Wong · Chandan Babu R · commit 1e5efd72a29e · 2024-02-24T10:43:26.000+05:30
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: 2c1e31e ("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
@@ -3532,6 +3532,7 @@ xlog_recover_finish(
 		 * and AIL.
 		 */
 		xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);
+		error = 0;
 		goto out_error;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3532,6 +3532,7 @@ xlog_recover_finish(`
`3532`	`3532`	`* and AIL.`
`3533`	`3533`	`*/`
`3534`	`3534`	`xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);`
	`3535`	`+ error = 0;`
`3535`	`3536`	`goto out_error;`
`3536`	`3537`	`}`
`3537`	`3538`