From: Darrick J. Wong Date: Wed, 13 Dec 2017 06:03:26 +0000 (-0800) Subject: common/xfs: fix scrub support probing again X-Git-Tag: v2022.05.01~1732 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=9d5ea22aea6bdbb0650f265037b17d4a5c20c647 common/xfs: fix scrub support probing again In the final version of the xfs_io scrub command we don't allow the probe function to have any parameters, so fix the helper to abide that. Signed-off-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/common/xfs b/common/xfs index 799a545d..5cfa7612 100644 --- a/common/xfs +++ b/common/xfs @@ -314,7 +314,7 @@ _supports_xfs_scrub() # Probe for kernel support... $XFS_IO_PROG -c 'help scrub' 2>&1 | grep -q 'types are:.*probe' || return 1 - $XFS_IO_PROG -c "scrub probe 0" "$mountpoint" 2>&1 | grep -q "Inappropriate ioctl" && return 1 + $XFS_IO_PROG -c "scrub probe" "$mountpoint" 2>&1 | grep -q "Inappropriate ioctl" && return 1 # Scrub can't run on norecovery mounts _fs_options "$device" | grep -q "norecovery" && return 1