xfs/073: avoid finobt warning from mkfs

When testing xfs/073 with MKFS_OPTIONS="-m crc=1,finobt=1" set, it fails
due to extra warning about disabling finobt feature:

 +warning: finobt not supported without CRC support, disabled.

Because xfs/073 disables crc unconditionally and finobt can not be
enabled either.

Fix it by explicitly disabling finobt as well.

Also remove all meta related mkfs options in _scratch_mkfs_xfs_opts() if
mkfs.xfs has no metadata support, not only the crc option. So that test
still passes on distros with such old binaries.

Suggested-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/rc b/common/rc
index 8f925a8a1b2efd5cad3066135a971f3c8ee39aeb..2ac159d905c43c6b2c3a7ba0be33864861e0d4cd 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -444,9 +444,9 @@ _scratch_mkfs_xfs_opts()
 {
        mkfs_opts=$*
 
-       # remove crc related mkfs options if mkfs.xfs doesn't support v5 xfs
+       # remove metadata related mkfs options if mkfs.xfs doesn't them
        if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
-               mkfs_opts=`echo $mkfs_opts | sed "s/-m\s\+crc=.//"`
+               mkfs_opts=`echo $mkfs_opts | sed "s/-m\s\+\S\+//g"`
        fi
 
        _scratch_options mkfs

diff --git a/tests/xfs/073 b/tests/xfs/073
index e1335df9133d0c5dcbac05843b37ac75db875467..9e292234350b0e16ee969cb3e412e25c04a22b91 100755 (executable)
--- a/tests/xfs/073
+++ b/tests/xfs/073
@@ -138,7 +138,7 @@ _require_loop
 
 rm -f $seqres.full
 
-_scratch_mkfs_xfs -m crc=0 -dsize=41m,agcount=2 | _filter_mkfs 2>/dev/null
+_scratch_mkfs_xfs -m crc=0 -dsize=41m,agcount=2 >>$seqres.full 2>&1
 _scratch_mount 2>/dev/null || _fail "initial scratch mount failed"
 
 echo

diff --git a/tests/xfs/073.out b/tests/xfs/073.out
index fb035cbe4d4dc81eb7c6a5a4b786f0dd021615f5..5f36ebe81daff7afb45abb71198b221ba1e626cd 100644 (file)
--- a/tests/xfs/073.out
+++ b/tests/xfs/073.out
@@ -1,13 +1,4 @@
 QA output created by 073
-warning: finobt not supported without CRC support, disabled.
-warning: rmapbt not supported without CRC support, disabled.
-warning: reflink not supported without CRC support, disabled.
-meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
-data     = bsize=XXX blocks=XXX, imaxpct=PCT
-         = sunit=XXX swidth=XXX, unwritten=X
-naming   =VERN bsize=XXX
-log      =LDEV bsize=XXX blocks=XXX
-realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 
 === populating scratch device
 1000+0 records in