apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfs/129: fix post-metadump remounting idiocy

Browse Source 
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>
This commit is contained in:
Darrick J. Wong
2016-07-21 16:47:07 -07:00
committed by Eryu Guan
parent 2f8d7b2ff0
commit b85dfac4ca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xfs/129
+3 -3
View File
@@ -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