Fixes direct invocations of xfs_repair to add in -r option if required.
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Signed-off-by: Richard Wareing <rwareing@xxxxxx>
---
Changes since v3:
* Formatting nits
Changes since v2:
* Added check for USE_EXTERNAL in tests/xfs/291 & tests/xfs/070
* Call xfs_repair via $XFS_REPAIR_PROG
Changes since v1:
* Fixed kill -9 in test xfs/070
tests/xfs/070 | 5 ++++-
tests/xfs/291 | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/xfs/070 b/tests/xfs/070
index 0ae6eff..81111d5 100755
--- a/tests/xfs/070
+++ b/tests/xfs/070
@@ -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
diff --git a/tests/xfs/291 b/tests/xfs/291
index 3f5295c..fd5c1f1 100755
--- a/tests/xfs/291
+++ b/tests/xfs/291
@@ -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
--
2.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
