xfs: remove support for tools and kernels without v5 support

v5 file systems have been the default for more than 10 years.  Drop
support for non-v5 enabled kernels and xfsprogs.

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

diff --git a/common/config b/common/config
index 2a1434bb11b9cfb3a25f1079649476b7cd31e90d..6a0496fddff0fc819753c5062e25baa48a50fd55 100644 (file)
--- a/common/config
+++ b/common/config
@@ -329,19 +329,6 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
        export SELINUX_MOUNT_OPTIONS
 fi
 
-# check if mkfs.xfs supports v5 xfs
-if [ "$FSTYP" == "xfs" ]; then
-       XFS_MKFS_HAS_NO_META_SUPPORT=""
-       touch /tmp/crc_check.img
-       $MKFS_XFS_PROG -N -d file,name=/tmp/crc_check.img,size=32m -m crc=0 \
-               >/dev/null 2>&1;
-       if [ $? -ne 0 ]; then
-               XFS_MKFS_HAS_NO_META_SUPPORT=true
-       fi
-       rm -f /tmp/crc_check.img
-       export XFS_MKFS_HAS_NO_META_SUPPORT
-fi
-
 _common_mount_opts()
 {
        case $FSTYP in

diff --git a/common/xfs b/common/xfs
index 65b509691b66edae98b8d24f4274cd04dc00edd0..57d21762ce8002959ccd748a02fb3137d37675d1 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -59,11 +59,6 @@ _scratch_mkfs_xfs_opts()
 {
        mkfs_opts=$*
 
-       # 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\+\S\+//g"`
-       fi
-
        _scratch_options mkfs
 
        echo "$MKFS_XFS_PROG $SCRATCH_OPTIONS $mkfs_opts"
@@ -439,24 +434,6 @@ _require_projid16bit()
           || _notrun "16 bit project IDs not supported on $SCRATCH_DEV"
 }
 
-# this test requires the crc feature to be available in mkfs.xfs
-#
-_require_xfs_mkfs_crc()
-{
-       _scratch_mkfs_xfs_supported -m crc=1 >/dev/null 2>&1 \
-          || _notrun "mkfs.xfs doesn't have crc feature"
-}
-
-# this test requires the xfs kernel support crc feature
-#
-_require_xfs_crc()
-{
-       _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1
-       _try_scratch_mount >/dev/null 2>&1 \
-          || _notrun "Kernel doesn't support crc feature"
-       _scratch_unmount
-}
-
 # If the xfs_info output for the given XFS filesystem mount mentions the given
 # feature.  If so, return 0 for success.  If not, return 1 for failure.  If the
 # third option is -v, echo 1 for success and 0 for not.
@@ -1268,9 +1245,6 @@ _require_scratch_xfs_shrink()
 #
 _require_meta_uuid()
 {
-       # This will create a crc fs on $SCRATCH_DEV
-       _require_xfs_crc
-
        _scratch_xfs_db -x -c "uuid restore" 2>&1 \
           | grep -q "invalid UUID\|supported on V5 fs" \
           && _notrun "Userspace doesn't support meta_uuid feature"

diff --git a/tests/xfs/002 b/tests/xfs/002
index 6c0bb4d0452ed1d6f91c5a15968eef98bbf5b2ef..8dfd2693b1d08bdf2b27fb370346d12ddbd28ffa 100755 (executable)
--- a/tests/xfs/002
+++ b/tests/xfs/002
@@ -24,9 +24,6 @@ _supported_fs xfs
 _require_scratch_nocheck
 _require_no_large_scratch_dev
 
-# So we can explicitly turn it _off_:
-_require_xfs_mkfs_crc
-
 _scratch_mkfs_xfs -m crc=0 -d size=128m >> $seqres.full 2>&1 || _fail "mkfs failed"
 
 # Scribble past a couple V4 secondary superblocks to populate sb_crc

diff --git a/tests/xfs/005 b/tests/xfs/005
index 5f1ab834856bef9c1f17e747ac2531b0de589bf2..019790295554c6bff7eeba58b5c66e87976207d3 100755 (executable)
--- a/tests/xfs/005
+++ b/tests/xfs/005
@@ -20,7 +20,6 @@ _begin_fstest auto quick
 _supported_fs xfs
 
 _require_scratch_nocheck
-_require_xfs_mkfs_crc
 
 _scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail "mkfs failed"
 

diff --git a/tests/xfs/077 b/tests/xfs/077
index f24f6f004b50cc7dee04c84940e05ce933eec403..37ea931f16685108f70f7ebb88808d4f4d4e5307 100755 (executable)
--- a/tests/xfs/077
+++ b/tests/xfs/077
@@ -24,7 +24,6 @@ _supported_fs xfs
 _require_xfs_copy
 _require_scratch
 _require_no_large_scratch_dev
-_require_xfs_crc
 _require_meta_uuid
 
 # Takes 2 args, 2nd optional:

diff --git a/tests/xfs/083 b/tests/xfs/083
index edab3b7b092222cf5800eccff2bf2182f70fd6f9..e8ce2221c8ffa0e5e62c417b10bf8e62dbd95738 100755 (executable)
--- a/tests/xfs/083
+++ b/tests/xfs/083
@@ -28,8 +28,6 @@ _cleanup()
 _supported_fs xfs
 
 _require_scratch
-#_require_xfs_crc      # checksum not required, but you probably want it anyway...
-#_require_xfs_mkfs_crc
 _require_attrs
 _require_populate_commands
 

diff --git a/tests/xfs/132 b/tests/xfs/132
index fa36c09c20a1144585aca35bda945b75f68a6150..ee1c8c1ec0b982c3bedab989628f8f32f13327c0 100755 (executable)
--- a/tests/xfs/132
+++ b/tests/xfs/132
@@ -24,7 +24,6 @@ _require_scratch_nocheck
 # due to transaction cancellation.  Hence we don't want to check dmesg here.
 _disable_dmesg_check
 
-_require_xfs_mkfs_crc
 _scratch_mkfs -m crc=0 > $seqres.full 2>&1
 
 # The files that EIO in the golden output changes if we have quotas enabled

diff --git a/tests/xfs/148 b/tests/xfs/148
index 5d0a0bf426987fe1dda2bc53aea0ae8668f27808..c9f634cfd02638b4099786664f888ddbfb69c7a3 100755 (executable)
--- a/tests/xfs/148
+++ b/tests/xfs/148
@@ -27,7 +27,6 @@ _cleanup()
 _supported_fs xfs
 _require_test
 _require_attrs
-_require_xfs_mkfs_crc
 _disable_dmesg_check
 
 imgfile=$TEST_DIR/img-$seq

diff --git a/tests/xfs/263 b/tests/xfs/263
index bce4e13f92243c787265c312c5e23f8b6bf96a37..bd30dab110b01096b0ec3543fcb96a465b416f82 100755 (executable)
--- a/tests/xfs/263
+++ b/tests/xfs/263
@@ -21,11 +21,6 @@ _supported_fs xfs
 _require_scratch
 _require_xfs_quota
 
-# We could test older, non-project capable kernels but keep it simpler;
-# Only test crc and beyond (but we will test with and without the feature)
-_require_xfs_mkfs_crc
-_require_xfs_crc
-
 function option_string()
 {
        VAL=$1

diff --git a/tests/xfs/299 b/tests/xfs/299
index 4b9df3c6aa2425cd00616fbf019392afdbc59ef9..1df1988acf05c19e5115aa60886db9dbf794a9dc 100755 (executable)
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -31,8 +31,6 @@ chmod a+rwx $seqres.full      # arbitrary users will write here
 
 _require_scratch
 _require_xfs_quota
-_require_xfs_mkfs_crc
-_require_xfs_crc
 
 # The actual point at which limit enforcement takes place for the
 # hard block limit is variable depending on filesystem blocksize,

diff --git a/tests/xfs/304 b/tests/xfs/304
index 3c38e61323c8c37cfa906eee8dc219b5d9861bbf..0ee6dad6360c876568aff972733fb2310be37e6c 100755 (executable)
--- a/tests/xfs/304
+++ b/tests/xfs/304
@@ -19,8 +19,6 @@ _supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
-_require_xfs_mkfs_crc
-_require_xfs_crc
 
 _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1
 

diff --git a/tests/xfs/305 b/tests/xfs/305
index d8a6712e528c8cd4d3d17bd5798184dd175fc581..e76dfdec11093e8926946ffe1278ca605fc7b39d 100755 (executable)
--- a/tests/xfs/305
+++ b/tests/xfs/305
@@ -19,8 +19,6 @@ _supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
-_require_xfs_mkfs_crc
-_require_xfs_crc
 _require_command "$KILLALL_PROG" killall
 
 _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1