From: Darrick J. Wong <djwong@xxxxxxxxxx> Convert this test to use _scratch_xfs_repair, since the only variance from the standard usage is that it's called against a sparse file into which the scratch filesystem has been metadumped and mdrestored. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- tests/xfs/291 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/xfs/291 b/tests/xfs/291 index 6d5e247e..a2425e47 100755 --- a/tests/xfs/291 +++ b/tests/xfs/291 @@ -93,11 +93,7 @@ _scratch_xfs_check >> $seqres.full 2>&1 || _fail "xfs_check failed" # Can xfs_metadump cope with this monster? _scratch_xfs_metadump $tmp.metadump || _fail "xfs_metadump failed" xfs_mdrestore $tmp.metadump $tmp.img || _fail "xfs_mdrestore failed" -[ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ] && \ - rt_repair_opts="-r $SCRATCH_RTDEV" -[ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_LOGDEV" ] && \ - log_repair_opts="-l $SCRATCH_LOGDEV" -$XFS_REPAIR_PROG $rt_repair_opts $log_repair_opts -f $tmp.img >> $seqres.full 2>&1 || \ +SCRATCH_DEV=$tmp.img _scratch_xfs_repair -f &>> $seqres.full || \ _fail "xfs_repair of metadump failed" # Yes it can; success, all done
