xfs/291: fix open-coded repair call to mdrestore'd fs image

Attach any external log devices to the open-coded repair call.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2020-09-14 18:44:50 -07:00
committed by Eryu Guan
parent dabc002bcf
commit 9aa40b59f8
+3 -1
View File
@@ -110,7 +110,9 @@ _scratch_metadump $tmp.metadump || _fail "xfs_metadump failed"
xfs_mdrestore $tmp.metadump $tmp.img || _fail "xfs_mdrestore failed" xfs_mdrestore $tmp.metadump $tmp.img || _fail "xfs_mdrestore failed"
[ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ] && \ [ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ] && \
rt_repair_opts="-r $SCRATCH_RTDEV" rt_repair_opts="-r $SCRATCH_RTDEV"
$XFS_REPAIR_PROG $rt_repair_opts -f $tmp.img >> $seqres.full 2>&1 || \ [ "$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 || \
_fail "xfs_repair of metadump failed" _fail "xfs_repair of metadump failed"
# Yes it can; success, all done # Yes it can; success, all done