common/xfs: fix scrub support probing again
authorDarrick J. Wong <darrick.wong@oracle.com>
Wed, 13 Dec 2017 06:03:26 +0000 (22:03 -0800)
committerEryu Guan <eguan@redhat.com>
Fri, 15 Dec 2017 07:16:46 +0000 (15:16 +0800)
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 <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
common/xfs

index 799a545de72523f1e3c9b8d55972062eccc6228c..5cfa761248833bc41feee2d1cee1a2e0a28a3905 100644 (file)
@@ -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