btrfs-progs: tests: Fix mount fail of 013-extent-tree-rebuild

mount command in old system can not add "-o loop" option automatically
for loop device, and make following test failed:
  # ./fsck-tests.sh
  ...
    [TEST]   013-extent-tree-rebuild
  failed: mount /data/btrfsprogs/tests/test.img /data/btrfsprogs/tests/mnt
  test failed for case 013-extent-tree-rebuild

Considering that $TEST_DEV can be block or loop device, we need determine
our mount option in a condition for both case.

This patch create a wrapper function for above request, to solve current
problem in 013-extent-tree-rebuild, and support similar request in future.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/tests/fsck-tests/013-extent-tree-rebuild/test.sh b/tests/fsck-tests/013-extent-tree-rebuild/test.sh
index b7909d286c643e6da77cfda509a38fc453db8235..7419d6ea9f9d845867fb513faf125836340c523e 100755 (executable)
--- a/tests/fsck-tests/013-extent-tree-rebuild/test.sh
+++ b/tests/fsck-tests/013-extent-tree-rebuild/test.sh
@@ -12,14 +12,14 @@ test_extent_tree_rebuild()
 {
        run_check $SUDO_HELPER $TOP/mkfs.btrfs -f $TEST_DEV
 
-       run_check $SUDO_HELPER mount $TEST_DEV $TEST_MNT
+       run_check_mount_test_dev
        run_check $SUDO_HELPER cp -aR /lib/modules/`uname -r`/ $TEST_MNT
 
        for i in `seq 1 100`;do
                run_check $SUDO_HELPER $TOP/btrfs sub snapshot $TEST_MNT \
                        $TEST_MNT/snapaaaaaaa_$i
        done
-       run_check $SUDO_HELPER umount $TEST_DEV
+       run_check_umount_test_dev
 
        # get extent root bytenr
        extent_root_bytenr=`$SUDO_HELPER $TOP/btrfs-debug-tree -r $TEST_DEV | \