From: Darrick J. Wong Date: Wed, 3 Aug 2022 04:21:31 +0000 (-0700) Subject: xfs/291: convert open-coded _scratch_xfs_repair usage X-Git-Tag: v2022.08.07~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbfa39e7a5cf1e11b1e0f3448f690ae16e9e5477;p=xfstests-dev.git xfs/291: convert open-coded _scratch_xfs_repair usage 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 Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- 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