From: Darrick J. Wong <djwong@kernel.org>
Date: Wed, 24 Jun 2026 18:16:04 +0000 (-0700)
Subject: xfs_scrub: warn about incomplete repairs if we never get to them
X-Git-Tag: v7.1.0~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6dba3d85ae5b7e26386edf1806934473e57e51d;p=xfsprogs-dev.git

xfs_scrub: warn about incomplete repairs if we never get to them

If the final pass at repairs fails because the kernel says the
filesystem is busy, we should emit this error to the caller instead of
dropping it silently.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/scrub/repair.c b/scrub/repair.c
index 5d821655..fdefc213 100644
--- a/scrub/repair.c
+++ b/scrub/repair.c
@@ -110,7 +110,10 @@ repair_epilogue(
 	case EDEADLOCK:
 	case EBUSY:
 		/* Filesystem is busy, try again later. */
-		if (debug || verbose)
+		if (repair_flags & XRM_FINAL_WARNING)
+			str_error(ctx, descr_render(dsc),
+_("Filesystem is busy, repair incomplete."));
+		else if (debug || verbose)
 			str_info(ctx, descr_render(dsc),
 _("Filesystem is busy, deferring repair."));
 		return 0;