From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Thu, 21 Jul 2016 23:47:07 +0000 (-0700)
Subject: xfs/129: fix post-metadump remounting idiocy
X-Git-Tag: v2022.05.01~2407
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b85dfac4ca9ec1b096ea95bba128dd72dbf006c5;p=xfstests-dev.git

xfs/129: fix post-metadump remounting idiocy

Use the standard _scratch_mount to mount the filesystem from the
restored image, instead of trying to call mount directly. This is
needed in case we had custom mount options (like rtdev).

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/tests/xfs/129 b/tests/xfs/129
index d29f842d..17ff2388 100755
--- a/tests/xfs/129
+++ b/tests/xfs/129
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _cleanup()
 {
     cd /
-    umount $SCRATCH_MNT > /dev/null 2>&1
+    _scratch_unmount > /dev/null 2>&1
     rm -rf $tmp.* $testdir $metadump_file $TEST_DIR/image
 }
 
@@ -76,8 +76,8 @@ _scratch_metadump $metadump_file
 # Now restore the obfuscated one back and take a look around
 echo "Restore metadump"
 xfs_mdrestore $metadump_file $TEST_DIR/image
-_mount -t $FSTYP $TEST_DIR/image $SCRATCH_MNT
-umount $SCRATCH_MNT
+SCRATCH_DEV=$TEST_DIR/image _scratch_mount
+SCRATCH_DEV=$TEST_DIR/image _scratch_unmount
 
 echo "Check restored fs"
 _check_generic_filesystem $metadump_file