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>
This commit is contained in:
Zorro Lang
2017-03-10 00:40:19 +08:00
committed by Eryu Guan
parent 265c1037ee
commit f947088198
2 changed files with 34 additions and 31 deletions
+26 -23
View File
@@ -34,11 +34,13 @@ trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
_cleanup() _cleanup()
{ {
cd / cd /
rm -f $tmp.* rm -f $tmp.*
umount $LOOP_MNT 2>/dev/null $UMOUNT_PROG $LOOP_MNT 2>/dev/null
[ -n "$LOOP_DEV" ] && losetup -d $LOOP_DEV [ -n "$LOOP_DEV" ] && _destroy_loop_device $LOOP_DEV 2>/dev/null
rmdir $LOOP_MNT # 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 # get standard environment, filters and checks
@@ -52,6 +54,7 @@ _supported_os Linux
_require_test _require_test
# Must have loop device # Must have loop device
_require_loop _require_loop
_require_xfs_io_command "truncate"
LOOP_IMG=$TEST_DIR/$seq.fs LOOP_IMG=$TEST_DIR/$seq.fs
LOOP_MNT=$TEST_DIR/$seq.mnt LOOP_MNT=$TEST_DIR/$seq.mnt
@@ -77,9 +80,12 @@ _grow_loop()
check=$4 check=$4
agsize=$5 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 if [ -n "$agsize" ]; then
dparam="$dparam,agsize=$agsize" dparam="-d agsize=$agsize"
fi fi
echo echo
@@ -87,46 +93,43 @@ _grow_loop()
echo echo
echo "*** mkfs loop file (size=$original)" echo "*** mkfs loop file (size=$original)"
mkfs_crc_opts="-m crc=0" mkfs_crc_opts=""
if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then if [ $bsize -lt 1024 -a -z "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
mkfs_crc_opts="" mkfs_crc_opts="-m crc=0"
fi 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 | _filter_mkfs 2>/dev/null
echo "*** extend loop file" echo "*** extend loop file"
_destroy_loop_device $LOOP_DEV
$XFS_IO_PROG -c "pwrite $new_size $bsize" $LOOP_IMG | _filter_io $XFS_IO_PROG -c "pwrite $new_size $bsize" $LOOP_IMG | _filter_io
LOOP_DEV=`_create_loop_device $LOOP_IMG`
echo "*** mount loop filesystem" 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" 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 $XFS_GROWFS_PROG $LOOP_MNT 2>&1 | _filter_growfs 2>&1
echo "*** unmount" echo "*** unmount"
umount $LOOP_MNT > /dev/null 2>&1 $UMOUNT_PROG -d $LOOP_MNT && LOOP_DEV=
# Large grows takes forever to check.. # Large grows takes forever to check..
if [ "$check" -gt "0" ] if [ "$check" -gt "0" ]
then then
echo "*** check" echo "*** check"
LOOP_DEV=`losetup -f` _check_xfs_filesystem $LOOP_IMG none none
losetup $LOOP_DEV $LOOP_IMG
_check_xfs_filesystem $LOOP_DEV none none
losetup -d $LOOP_DEV
LOOP_DEV=
fi fi
rm -f $LOOP_IMG rm -f $LOOP_IMG
} }
# Wes' problem sizes... # Wes' problem sizes...
_grow_loop 168024b 1376452608 4096 1 _grow_loop $((168024*4096)) 1376452608 4096 1
# Some other blocksize cases... # Some other blocksize cases...
_grow_loop 168024b 1376452608 2048 1 _grow_loop $((168024*2048)) 1376452608 2048 1
_grow_loop 168024b 1376452608 512 1 16m _grow_loop $((168024*512)) 1376452608 512 1 16m
_grow_loop 168024b 688230400 1024 1 _grow_loop $((168024*1024)) 688230400 1024 1
# Other corner cases suggested by dgc # Other corner cases suggested by dgc
# also the following doesn't check if the filesystem is consistent. # also the following doesn't check if the filesystem is consistent.
+8 -8
View File
@@ -1,9 +1,9 @@
QA output created by 078 QA output created by 078
*** create loop mount point *** 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 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
data = bsize=XXX blocks=XXX, imaxpct=PCT data = bsize=XXX blocks=XXX, imaxpct=PCT
= sunit=XXX swidth=XXX, unwritten=X = sunit=XXX swidth=XXX, unwritten=X
@@ -19,9 +19,9 @@ data blocks changed from 168024 to 336048
*** unmount *** unmount
*** check *** 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 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
data = bsize=XXX blocks=XXX, imaxpct=PCT data = bsize=XXX blocks=XXX, imaxpct=PCT
= sunit=XXX swidth=XXX, unwritten=X = sunit=XXX swidth=XXX, unwritten=X
@@ -37,9 +37,9 @@ data blocks changed from 168024 to 672096
*** unmount *** unmount
*** check *** 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 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
data = bsize=XXX blocks=XXX, imaxpct=PCT data = bsize=XXX blocks=XXX, imaxpct=PCT
= sunit=XXX swidth=XXX, unwritten=X = sunit=XXX swidth=XXX, unwritten=X
@@ -55,9 +55,9 @@ data blocks changed from 163840 to 2688384
*** unmount *** unmount
*** check *** 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 meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
data = bsize=XXX blocks=XXX, imaxpct=PCT data = bsize=XXX blocks=XXX, imaxpct=PCT
= sunit=XXX swidth=XXX, unwritten=X = sunit=XXX swidth=XXX, unwritten=X