From b85dfac4ca9ec1b096ea95bba128dd72dbf006c5 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 21 Jul 2016 16:47:07 -0700 Subject: [PATCH] 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 Reviewed-by: Christoph Hellwig Signed-off-by: Eryu Guan --- tests/xfs/129 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.39.5