| Message ID | 146914482728.11762.13650586482755819412.stgit@birch.djwong.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Jul 21, 2016 at 04:47:07PM -0700, Darrick J. Wong wrote: > 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> Looks fine, Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/tests/xfs/129 b/tests/xfs/129 index d29f842..17ff238 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
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> --- tests/xfs/129 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)