From: Darrick J. Wong Date: Mon, 2 Feb 2026 19:14:05 +0000 (-0800) Subject: xfs_scrub_all: fix non-service-mode arguments to xfs_scrub X-Git-Tag: v6.19.0~20 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=783268546e983c78454ce635a902ec54cd6f75b1;p=xfsprogs-dev.git xfs_scrub_all: fix non-service-mode arguments to xfs_scrub Back in commit 7da76e2745d6a7, we changed the default arguments to xfs_scrub for the xfs_scrub@ service to derive the fix/preen/check mode from the "autofsck" filesystem property instead of hardcoding "-p". Unfortunately, I forgot to make the same update for xfs_scrub_all being run from the CLI and directly invoking xfs_scrub. Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1125314 Cc: linux-xfs@vger.kernel.org # v6.10.0 Fixes: 7da76e2745d6a7 ("xfs_scrub: use the autofsck fsproperty to select mode") Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- diff --git a/scrub/Makefile b/scrub/Makefile index 6375d77a..ff79a265 100644 --- a/scrub/Makefile +++ b/scrub/Makefile @@ -16,7 +16,7 @@ LTCOMMAND = xfs_scrub INSTALL_SCRUB = install-scrub XFS_SCRUB_ALL_PROG = xfs_scrub_all.py XFS_SCRUB_FAIL_PROG = xfs_scrub_fail -XFS_SCRUB_ARGS = -p +XFS_SCRUB_ARGS = -o autofsck XFS_SCRUB_SERVICE_ARGS = -b -o autofsck ifeq ($(HAVE_SYSTEMD),yes) INSTALL_SCRUB += install-systemd diff --git a/scrub/xfs_scrub_all.py.in b/scrub/xfs_scrub_all.py.in index ce251dae..9f861639 100644 --- a/scrub/xfs_scrub_all.py.in +++ b/scrub/xfs_scrub_all.py.in @@ -102,7 +102,8 @@ class scrub_subprocess(scrub_control): cmd = ['@sbindir@/xfs_scrub'] if 'SERVICE_MODE' in os.environ: cmd += '@scrub_service_args@'.split() - cmd += '@scrub_args@'.split() + else: + cmd += '@scrub_args@'.split() if scrub_media: cmd += '-x' cmd += [mnt]