[03/13] xfs/{130,235}: deal with an unreplayable dirty log
diff mbox

Message ID 147216771851.32641.12882618561173838572.stgit@birch.djwong.org
State Accepted
Headers show

Commit Message

Darrick J. Wong Aug. 25, 2016, 11:28 p.m. UTC
Now that we have log replay items, an FS shutdown due to a corrupt
btree results in a log that can't be replayed.  The only solution here
is to zap the log when we're fixing the corrupt fs, so do that here.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/130 |    3 ++-
 tests/xfs/235 |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Patch
diff mbox

diff --git a/tests/xfs/130 b/tests/xfs/130
index 7d8ea2a..554d078 100755
--- a/tests/xfs/130
+++ b/tests/xfs/130
@@ -87,7 +87,8 @@  _cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file4" 2> /dev/null && \
 umount "${SCRATCH_MNT}"
 
 echo "+ repair fs"
-_scratch_xfs_repair >> "$seqres.full" 2>&1
+_disable_dmesg_check
+_repair_scratch_fs >> "$seqres.full" 2>&1
 _scratch_xfs_repair >> "$seqres.full" 2>&1
 
 echo "+ mount image (2)"
diff --git a/tests/xfs/235 b/tests/xfs/235
index c2e0340..ef51d22 100755
--- a/tests/xfs/235
+++ b/tests/xfs/235
@@ -85,7 +85,8 @@  test -s ${SCRATCH_MNT}/file4 && _fail "should not be able to copy with busted rm
 umount ${SCRATCH_MNT}
 
 echo "+ repair fs"
-_scratch_xfs_repair >> $seqres.full 2>&1
+_disable_dmesg_check
+_repair_scratch_fs >> "$seqres.full" 2>&1
 _scratch_xfs_repair >> $seqres.full 2>&1
 
 echo "+ mount image (2)"