xfs/078: instead file image by mkfs on loopback device

If test on 4k sector size device, xfs/078 will fail when it try to
make a filesystem image with block size less than 4096. But if we
attach the file image to a loop device, it can accept 512 block
size. So this patch attach a loop device before do mkfs.xfs.

[eguan: replace bare mount/umount with [U]MOUNT_PROG]

Signed-off-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/xfs/078 b/tests/xfs/078
index 0d6eb5573490edf5d63aefdf837cd65e8e4534fc..44de65904f17f1217430afad07e3d13cebd1a194 100755 (executable)
--- a/tests/xfs/078
+++ b/tests/xfs/078
@@ -34,11 +34,13 @@ trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
-    cd /
-    rm -f $tmp.*
-    umount $LOOP_MNT 2>/dev/null
-    [ -n "$LOOP_DEV" ] && losetup -d $LOOP_DEV
-    rmdir $LOOP_MNT
+       cd /
+       rm -f $tmp.*
+       $UMOUNT_PROG $LOOP_MNT 2>/dev/null
+       [ -n "$LOOP_DEV" ] && _destroy_loop_device $LOOP_DEV 2>/dev/null
+       # try to keep the image file if test fails
+       [ $status -eq 0 ] && rm -f $LOOP_IMG
+       rmdir $LOOP_MNT
 }
 
 # get standard environment, filters and checks
@@ -52,6 +54,7 @@ _supported_os Linux
 _require_test
 # Must have loop device
 _require_loop
+_require_xfs_io_command "truncate"
 
 LOOP_IMG=$TEST_DIR/$seq.fs
 LOOP_MNT=$TEST_DIR/$seq.mnt
@@ -77,9 +80,12 @@ _grow_loop()
        check=$4
        agsize=$5
 
-       dparam="file,name=$LOOP_IMG,size=$original"
+       $XFS_IO_PROG -f -c "truncate $original" $LOOP_IMG
+       LOOP_DEV=`_create_loop_device $LOOP_IMG`
+
+       dparam=""
        if [ -n "$agsize" ]; then
-               dparam="$dparam,agsize=$agsize"
+               dparam="-d agsize=$agsize"
        fi
 
        echo
@@ -87,46 +93,43 @@ _grow_loop()
        echo
 
        echo "*** mkfs loop file (size=$original)"
-       mkfs_crc_opts="-m crc=0"
-       if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
-               mkfs_crc_opts=""
+       mkfs_crc_opts=""
+       if [ $bsize -lt 1024 -a -z "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
+               mkfs_crc_opts="-m crc=0"
        fi
-       $MKFS_XFS_PROG $mkfs_crc_opts -b size=$bsize -d $dparam \
+       $MKFS_XFS_PROG $mkfs_crc_opts -b size=$bsize $dparam $LOOP_DEV \
                | _filter_mkfs 2>/dev/null
 
        echo "*** extend loop file"
+       _destroy_loop_device $LOOP_DEV
        $XFS_IO_PROG -c "pwrite $new_size $bsize" $LOOP_IMG | _filter_io
+       LOOP_DEV=`_create_loop_device $LOOP_IMG`
        echo "*** mount loop filesystem"
-       mount -t xfs -o loop $LOOP_IMG $LOOP_MNT
+       $MOUNT_PROG -t xfs $LOOP_DEV $LOOP_MNT
 
        echo "*** grow loop filesystem"
-       #xfs_growfs $LOOP_MNT 2>&1 | grep -e "^data" #| _filter_growfs 2>/dev/null
        $XFS_GROWFS_PROG $LOOP_MNT 2>&1 |  _filter_growfs 2>&1
 
        echo "*** unmount"
-       umount $LOOP_MNT > /dev/null 2>&1
+       $UMOUNT_PROG -d $LOOP_MNT && LOOP_DEV=
 
        # Large grows takes forever to check..
        if [ "$check" -gt "0" ]
        then
                echo "*** check"
-               LOOP_DEV=`losetup -f`
-               losetup $LOOP_DEV $LOOP_IMG
-                _check_xfs_filesystem $LOOP_DEV none none
-               losetup -d $LOOP_DEV
-               LOOP_DEV=
+               _check_xfs_filesystem $LOOP_IMG none none
        fi
 
        rm -f $LOOP_IMG
 }
 
 # Wes' problem sizes...
-_grow_loop 168024b 1376452608 4096 1
+_grow_loop $((168024*4096)) 1376452608 4096 1
 
 # Some other blocksize cases...
-_grow_loop 168024b 1376452608 2048 1
-_grow_loop 168024b 1376452608 512 1 16m
-_grow_loop 168024b 688230400 1024 1
+_grow_loop $((168024*2048)) 1376452608 2048 1
+_grow_loop $((168024*512)) 1376452608 512 1 16m
+_grow_loop $((168024*1024)) 688230400 1024 1
 
 # Other corner cases suggested by dgc
 # also the following doesn't check if the filesystem is consistent.

diff --git a/tests/xfs/078.out b/tests/xfs/078.out
index 4d294aa6d7a18e29c375f8abdf9af3c68fdc68be..cc3c47d1369134a406951752e664433e086c0fc0 100644 (file)
--- a/tests/xfs/078.out
+++ b/tests/xfs/078.out
@@ -1,9 +1,9 @@
 QA output created by 078
 *** create loop mount point
 
-=== GROWFS (from 168024b to 1376452608, 4096 blocksize)
+=== GROWFS (from 688226304 to 1376452608, 4096 blocksize)
 
-*** mkfs loop file (size=168024b)
+*** mkfs loop file (size=688226304)
 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
 data     = bsize=XXX blocks=XXX, imaxpct=PCT
          = sunit=XXX swidth=XXX, unwritten=X
@@ -19,9 +19,9 @@ data blocks changed from 168024 to 336048
 *** unmount
 *** check
 
-=== GROWFS (from 168024b to 1376452608, 2048 blocksize)
+=== GROWFS (from 344113152 to 1376452608, 2048 blocksize)
 
-*** mkfs loop file (size=168024b)
+*** mkfs loop file (size=344113152)
 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
 data     = bsize=XXX blocks=XXX, imaxpct=PCT
          = sunit=XXX swidth=XXX, unwritten=X
@@ -37,9 +37,9 @@ data blocks changed from 168024 to 672096
 *** unmount
 *** check
 
-=== GROWFS (from 168024b to 1376452608, 512 blocksize)
+=== GROWFS (from 86028288 to 1376452608, 512 blocksize)
 
-*** mkfs loop file (size=168024b)
+*** mkfs loop file (size=86028288)
 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
 data     = bsize=XXX blocks=XXX, imaxpct=PCT
          = sunit=XXX swidth=XXX, unwritten=X
@@ -55,9 +55,9 @@ data blocks changed from 163840 to 2688384
 *** unmount
 *** check
 
-=== GROWFS (from 168024b to 688230400, 1024 blocksize)
+=== GROWFS (from 172056576 to 688230400, 1024 blocksize)
 
-*** mkfs loop file (size=168024b)
+*** mkfs loop file (size=172056576)
 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
 data     = bsize=XXX blocks=XXX, imaxpct=PCT
          = sunit=XXX swidth=XXX, unwritten=X