Re: [PATCH v2 3/3] xfs/realtime: Fix direct invocations of xfs_repair
From: Darrick J. Wong <hidden>
Date: 2017-09-25 21:34:32
Also in:
linux-xfs
On Mon, Sep 25, 2017 at 12:56:25PM -0700, Richard Wareing wrote:
Fixes direct invocations of xfs_repair to add in -r option if required. Signed-off-by: Richard Wareing <redacted>
Looks ok, Reviewed-by: Darrick J. Wong <redacted>
quoted hunk ↗ jump to hunk
--- Changes since v1: * Fixed kill -9 in test xfs/070 tests/xfs/070 | 3 ++- tests/xfs/291 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)diff --git a/tests/xfs/070 b/tests/xfs/070 index 0ae6eff..a06e998 100755 --- a/tests/xfs/070 +++ b/tests/xfs/070@@ -56,7 +56,8 @@ _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 & + [ -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 runningdiff --git a/tests/xfs/291 b/tests/xfs/291 index 3f5295c..140fa33 100755 --- a/tests/xfs/291 +++ b/tests/xfs/291@@ -122,7 +122,8 @@ _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" +[ -n "$SCRATCH_RTDEV" ] && rt_repair_opts="-r $SCRATCH_RTDEV" +xfs_repair $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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html