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/realtime: Fix direct invocations of xfs_repair

Browse Source 
Fixes direct invocations of xfs_repair to add in -r option if required.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Richard Wareing <rwareing@fb.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Richard Wareing
2018-01-11 20:16:19 -08:00
committed by Eryu Guan
parent ee3e001035
commit 21e7398203
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xfs/070
+4 -1
View File
@@ -56,7 +56,10 @@ _cleanup()
_xfs_repair_noscan()
{
# invoke repair directly so we can kill the process if need be
$XFS_REPAIR_PROG $SCRATCH_DEV 2>&1 | tee -a $seqres.full > $tmp.repair &
[ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ] && \
rt_repair_opts="-r $SCRATCH_RTDEV"
$XFS_REPAIR_PROG $rt_repair_opts $SCRATCH_DEV 2>&1 |
tee -a $seqres.full > $tmp.repair &
repair_pid=$!
# monitor progress for as long as it is running
tests/xfs/291
+4 -1
View File
@@ -122,7 +122,10 @@ _xfs_check $SCRATCH_DEV >> $seqres.full 2>&1 || _fail "xfs_check failed"
# Can xfs_metadump cope with this monster?
_scratch_metadump $tmp.metadump || _fail "xfs_metadump failed"
xfs_mdrestore $tmp.metadump $tmp.img || _fail "xfs_mdrestore failed"
xfs_repair -f $tmp.img >> $seqres.full 2>&1 || _fail "xfs_repair of metadump failed"
[ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ] && \
rt_repair_opts="-r $SCRATCH_RTDEV"
$XFS_REPAIR_PROG $rt_repair_opts -f $tmp.img >> $seqres.full 2>&1 || \
_fail "xfs_repair of metadump failed"
# Yes it can; success, all done
status=0