xfs/259: drop the 512-byte fsblock logic from this test

V5 filesystems do not support 512-byte fsblocks, and mkfs.xfs has long
defaulted to V5 filesystems.  Drop the 512 from the test loops, which
means we can get rid of all the _fs_has_crcs logic.  As a further
cleanup, use the truncate -s command to create the sparse file instead
of dd since even RHEL7 supports the -s switch.

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

diff --git a/tests/xfs/259 b/tests/xfs/259
index c2d26381a91c029325b2aefba3f4468223b901e7..e367d35acc395661e593cb42ffe0201d1b7ff013 100755 (executable)
--- a/tests/xfs/259
+++ b/tests/xfs/259
@@ -30,28 +30,20 @@ testfile=$TEST_DIR/259.image
 # Test various sizes slightly less than 4 TB. Need to handle different
 # minimum block sizes for CRC enabled filesystems, but use a small log so we
 # don't write lots of zeros unnecessarily.
-sizes_to_check="4096 2048 1024 512"
-blocksizes="4096 2048 1024 512"
+sizes_to_check="4096 2048 1024"
+blocksizes="4096 2048 1024"
 four_TB=$(_math "2^42")
-# The initial value of _fs_has_crcs is not important, because we start testing
-# with 4096 block size, it only matters for 512 block size test
-_fs_has_crcs=0
+
 for del in $sizes_to_check; do
        for bs in $blocksizes; do
-               echo "Trying to make (4TB - ${del}B) long xfs, block size $bs"
-               # skip tests with 512 block size if the fs created has crc
-               # enabled by default
-               if [ $_fs_has_crcs -eq 1 -a $bs -eq 512 ]; then
-                       break;
-               fi
+               echo "Trying to make (4TB - ${del}B) long xfs, block size $bs" | \
+                       tee -a $seqres.full
                ddseek=$(_math "$four_TB - $del")
                rm -f "$testfile"
-               dd if=/dev/zero "of=$testfile" bs=1 count=0 seek=$ddseek \
-                       >/dev/null 2>&1 || echo "dd failed"
+               truncate -s $ddseek "$testfile"
                loop_dev=$(_create_loop_device $testfile)
-               $MKFS_XFS_PROG -l size=32m -b size=$bs $loop_dev |  _filter_mkfs \
-                       >/dev/null 2> $tmp.mkfs || echo "mkfs failed!"
-               . $tmp.mkfs
+               $MKFS_XFS_PROG -l size=32m -b size=$bs $loop_dev >> $seqres.full || \
+                       echo "mkfs failed!"
                sync
                _destroy_loop_device $loop_dev
                unset loop_dev

diff --git a/tests/xfs/259.out b/tests/xfs/259.out
index 9fc4920c2b33b3f79e23a25f9a63e9e069e30c07..50af1a9b32614758c3f11fa8cb997efa0160ec12 100644 (file)
--- a/tests/xfs/259.out
+++ b/tests/xfs/259.out
@@ -2,16 +2,9 @@ QA output created by 259
 Trying to make (4TB - 4096B) long xfs, block size 4096
 Trying to make (4TB - 4096B) long xfs, block size 2048
 Trying to make (4TB - 4096B) long xfs, block size 1024
-Trying to make (4TB - 4096B) long xfs, block size 512
 Trying to make (4TB - 2048B) long xfs, block size 4096
 Trying to make (4TB - 2048B) long xfs, block size 2048
 Trying to make (4TB - 2048B) long xfs, block size 1024
-Trying to make (4TB - 2048B) long xfs, block size 512
 Trying to make (4TB - 1024B) long xfs, block size 4096
 Trying to make (4TB - 1024B) long xfs, block size 2048
 Trying to make (4TB - 1024B) long xfs, block size 1024
-Trying to make (4TB - 1024B) long xfs, block size 512
-Trying to make (4TB - 512B) long xfs, block size 4096
-Trying to make (4TB - 512B) long xfs, block size 2048
-Trying to make (4TB - 512B) long xfs, block size 1024
-Trying to make (4TB - 512B) long xfs, block size 512