Dump log cleanups
v2 cover Dump log cleanups
Hi all,
This cleanup set is a followup to the log attribute replay test that was posted here:
https://lore.kernel.org/linux-xfs/[email protected]/
This set renames the *_inject_logprint functions to *_remount_dump_log and moves them to common/log.
Questions and feedback are appreciated!
Catherine
Catherine Hoang (4):
xfstests: Rename _scratch_inject_logprint to _scratch_remount_dump_log
xfstests: Rename _test_inject_logprint to _test_remount_dump_log common/log: Move *_dump_log routines to common/log common/log: Fix *_dump_log routines for ext4
common/inject | 26 -------------------------- common/log | 30 ++++++++++++++++++++++++++++-- tests/xfs/312 | 2 +- tests/xfs/313 | 2 +- tests/xfs/314 | 2 +- tests/xfs/315 | 2 +- tests/xfs/316 | 2 +- tests/xfs/317 | 2 +- tests/xfs/318 | 2 +- tests/xfs/319 | 2 +- tests/xfs/320 | 2 +- tests/xfs/321 | 2 +- tests/xfs/322 | 2 +- tests/xfs/323 | 2 +- tests/xfs/324 | 2 +- tests/xfs/325 | 2 +- tests/xfs/326 | 2 +- tests/xfs/329 | 2 +- 18 files changed, 44 insertions(+), 44 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/4 xfstests: Rename _scratch_inject_logprint to _scratch_remount_dump_log
Rename _scratch_inject_logprint to _scratch_remount_dump_log to better describe what this function does. _scratch_remount_dump_log unmounts and remounts the scratch device, dumping the log.
--- common/inject | 2 +- tests/xfs/312 | 2 +- tests/xfs/313 | 2 +- tests/xfs/314 | 2 +- tests/xfs/315 | 2 +- tests/xfs/316 | 2 +- tests/xfs/317 | 2 +- tests/xfs/318 | 2 +- tests/xfs/319 | 2 +- tests/xfs/320 | 2 +- tests/xfs/321 | 2 +- tests/xfs/322 | 2 +- tests/xfs/323 | 2 +- tests/xfs/324 | 2 +- tests/xfs/325 | 2 +- tests/xfs/326 | 2 +- tests/xfs/329 | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-)
common/inject +1 -1
@@ -113,7 +113,7 @@ _scratch_inject_error() } # Unmount and remount the scratch device, dumping the log -_scratch_inject_logprint() +_scratch_remount_dump_log() { local opts="$1"
tests/xfs/312 +1 -1
@@ -63,7 +63,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/313 +1 -1
@@ -63,7 +63,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/314 +1 -1
@@ -64,7 +64,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/315 +1 -1
@@ -61,7 +61,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/316 +1 -1
@@ -61,7 +61,7 @@ echo "CoW all the blocks" $XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz 0 $((blks * blksz))" $SCRATCH_MNT/file2 >> $seqres.full echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/317 +1 -1
@@ -54,7 +54,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file0 | _filter_scratch
tests/xfs/318 +1 -1
@@ -60,7 +60,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 2>&1 | _filter_scratch
tests/xfs/319 +1 -1
@@ -57,7 +57,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/320 +1 -1
@@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratch
tests/xfs/321 +1 -1
@@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratch
tests/xfs/322 +1 -1
@@ -56,7 +56,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratch
tests/xfs/323 +1 -1
@@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/324 +1 -1
@@ -61,7 +61,7 @@ echo "Reflink all the blocks" _cp_reflink $SCRATCH_MNT/file1 $SCRATCH_MNT/file4 echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/325 +1 -1
@@ -59,7 +59,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/326 +1 -1
@@ -71,7 +71,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfs
tests/xfs/329 +1 -1
@@ -52,7 +52,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" | tee /dev/ttyprintk -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full new_nextents=$(_count_extents $testdir/file1) echo "Check extent count" | tee /dev/ttyprintk
Signature · 1 line
2.25.1
Re: [PATCH v2 1/4] xfstests: Rename _scratch_inject_logprint to _scratch_remount_dump_log
Quoted 6 lines · Catherine Hoang
Rename
_scratch_inject_logprintto_scratch_remount_dump_logto better describe what this function does._scratch_remount_dump_logunmounts and remounts the scratch device, dumping the log.Signed-off-by Catherine Hoang <[email protected]>Reviewed-by Allison Henderson <[email protected]>
Looks straightforward,
--D
Quoted 244 lines
--- common/inject | 2 +- tests/xfs/312 | 2 +- tests/xfs/313 | 2 +- tests/xfs/314 | 2 +- tests/xfs/315 | 2 +- tests/xfs/316 | 2 +- tests/xfs/317 | 2 +- tests/xfs/318 | 2 +- tests/xfs/319 | 2 +- tests/xfs/320 | 2 +- tests/xfs/321 | 2 +- tests/xfs/322 | 2 +- tests/xfs/323 | 2 +- tests/xfs/324 | 2 +- tests/xfs/325 | 2 +- tests/xfs/326 | 2 +- tests/xfs/329 | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-)common/inject +1
-1@@ -113,7 +113,7 @@ _scratch_inject_error() } # Unmount and remount the scratch device, dumping the log -_scratch_inject_logprint() +_scratch_remount_dump_log() { local opts="$1"tests/xfs/312 +1
-1@@ -63,7 +63,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/313 +1
-1@@ -63,7 +63,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/314 +1
-1@@ -64,7 +64,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/315 +1
-1@@ -61,7 +61,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/316 +1
-1@@ -61,7 +61,7 @@ echo "CoW all the blocks" $XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz 0 $((blks * blksz))" $SCRATCH_MNT/file2 >> $seqres.full echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/317 +1
-1@@ -54,7 +54,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file0 | _filter_scratchtests/xfs/318 +1
-1@@ -60,7 +60,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 2>&1 | _filter_scratchtests/xfs/319 +1
-1@@ -57,7 +57,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/320 +1
-1@@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratchtests/xfs/321 +1
-1@@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratchtests/xfs/322 +1
-1@@ -56,7 +56,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "Check files" md5sum $SCRATCH_MNT/file1 | _filter_scratchtests/xfs/323 +1
-1@@ -55,7 +55,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/324 +1
-1@@ -61,7 +61,7 @@ echo "Reflink all the blocks" _cp_reflink $SCRATCH_MNT/file1 $SCRATCH_MNT/file4 echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/325 +1
-1@@ -59,7 +59,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/326 +1
-1@@ -71,7 +71,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full echo "FS should be online, touch should succeed" touch $SCRATCH_MNT/goodfstests/xfs/329 +1
-1@@ -52,7 +52,7 @@ echo "FS should be shut down, touch will fail" touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch echo "Remount to replay log" | tee /dev/ttyprintk -_scratch_inject_logprint >> $seqres.full +_scratch_remount_dump_log >> $seqres.full new_nextents=$(_count_extents $testdir/file1) echo "Check extent count" | tee /dev/ttyprintkSignature · 1 line
2.25.1
PATCH v2 2/4 xfstests: Rename _test_inject_logprint to _test_remount_dump_log
In reply to Catherine HoangRename _test_inject_logprint to _test_remount_dump_log to better describe what this function does. _test_remount_dump_log unmounts and remounts the test device, dumping the log.
--- common/inject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/inject +1 -1
@@ -126,7 +126,7 @@ _scratch_remount_dump_log() } # Unmount and remount the test device, dumping the log -_test_inject_logprint() +_test_remount_dump_log() { local opts="$1"
Signature · 1 line
2.25.1
Re: [PATCH v2 2/4] xfstests: Rename _test_inject_logprint to _test_remount_dump_log
Quoted 6 lines · Catherine Hoang
Rename
_test_inject_logprintto_test_remount_dump_logto better describe what this function does._test_remount_dump_logunmounts and remounts the test device, dumping the log.Signed-off-by Catherine Hoang <[email protected]>Reviewed-by Allison Henderson <[email protected]>
Looks ok,
--D
Quoted 20 lines
--- common/inject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/inject +1
-1@@ -126,7 +126,7 @@ _scratch_remount_dump_log() } # Unmount and remount the test device, dumping the log -_test_inject_logprint() +_test_remount_dump_log() { local opts="$1"Signature · 1 line
2.25.1
PATCH v2 3/4 common/log: Move *_dump_log routines to common/log
In reply to Catherine HoangMove _scratch_remount_dump_log and _test_remount_dump_log from common/inject to common/log. These routines do not inject errors and should be placed with other common log functions.
--- common/inject | 26 -------------------------- common/log | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-)
common/inject +0 -26
@@ -111,29 +111,3 @@ _scratch_inject_error() _fail "Cannot inject error ${type} value ${value}." fi } - -# Unmount and remount the scratch device, dumping the log -_scratch_remount_dump_log() -{ - local opts="$1" - - if test -n "$opts"; then - opts="-o $opts" - fi - _scratch_unmount - _scratch_dump_log - _scratch_mount "$opts" -} - -# Unmount and remount the test device, dumping the log -_test_remount_dump_log() -{ - local opts="$1" - - if test -n "$opts"; then - opts="-o $opts" - fi - _test_unmount - _test_dump_log - _test_mount "$opts" -}
common/log +26 -0
@@ -608,5 +608,31 @@ _get_log_configs() esac } +# Unmount and remount the scratch device, dumping the log +_scratch_remount_dump_log() +{ + local opts="$1" + + if test -n "$opts"; then + opts="-o $opts" + fi + _scratch_unmount + _scratch_dump_log + _scratch_mount "$opts" +} + +# Unmount and remount the test device, dumping the log +_test_remount_dump_log() +{ + local opts="$1" + + if test -n "$opts"; then + opts="-o $opts" + fi + _test_unmount + _test_dump_log + _test_mount "$opts" +} + # make sure this script returns success /bin/true
Signature · 1 line
2.25.1
Re: [PATCH v2 3/4] common/log: Move *_dump_log routines to common/log
Quoted 3 lines · Catherine Hoang
Move
_scratch_remount_dump_logand_test_remount_dump_logfrom common/inject to common/log. These routines do not inject errors and should be placed with other common log functions.
Doesn't this mean that all those tests that got changed in the first patch will also need an update to source common/log?
OH, right, common/inject sources common/log. Problem solved.
--D
Quoted 81 lines
Signed-off-by Catherine Hoang <[email protected]>Reviewed-by Allison Henderson <[email protected]>--- common/inject | 26 -------------------------- common/log | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-)common/inject +0
-26@@ -111,29 +111,3 @@ _scratch_inject_error() _fail "Cannot inject error ${type} value ${value}." fi } - -# Unmount and remount the scratch device, dumping the log -_scratch_remount_dump_log() -{ - local opts="$1" - - if test -n "$opts"; then - opts="-o $opts" - fi - _scratch_unmount - _scratch_dump_log - _scratch_mount "$opts" -} - -# Unmount and remount the test device, dumping the log -_test_remount_dump_log() -{ - local opts="$1" - - if test -n "$opts"; then - opts="-o $opts" - fi - _test_unmount - _test_dump_log - _test_mount "$opts" -}common/log +26
-0@@ -608,5 +608,31 @@ _get_log_configs() esac } +# Unmount and remount the scratch device, dumping the log +_scratch_remount_dump_log() +{ + local opts="$1" + + if test -n "$opts"; then + opts="-o $opts" + fi + _scratch_unmount + _scratch_dump_log + _scratch_mount "$opts" +} + +# Unmount and remount the test device, dumping the log +_test_remount_dump_log() +{ + local opts="$1" + + if test -n "$opts"; then + opts="-o $opts" + fi + _test_unmount + _test_dump_log + _test_mount "$opts" +} + # make sure this script returns success /bin/trueSignature · 1 line
2.25.1
PATCH v2 4/4 common/log: Fix *_dump_log routines for ext4
In reply to Catherine Hoangdumpe2fs -h displays the superblock contents, not the journal contents. Use the logdump utility to dump the contents of the journal.
--- common/log | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
common/log +2 -2
@@ -229,7 +229,7 @@ _scratch_dump_log() $DUMP_F2FS_PROG $SCRATCH_DEV ;; ext4) - $DUMPE2FS_PROG -h $SCRATCH_DEV + $DEBUGFS_PROG -R "logdump -a" $SCRATCH_DEV ;; *) ;;
@@ -246,7 +246,7 @@ _test_dump_log() $DUMP_F2FS_PROG $TEST_DEV ;; ext4) - $DUMPE2FS_PROG -h $TEST_DEV + $DEBUGFS_PROG -R "logdump -a" $TEST_DEV ;; *) ;;
Signature · 1 line
2.25.1
Re: [PATCH v2 4/4] common/log: Fix *_dump_log routines for ext4
Quoted 13 lines · Catherine Hoang
dumpe2fs -h displays the superblock contents, not the journal contents. Use the logdump utility to dump the contents of the journal.
Signed-off-by Catherine Hoang <[email protected]>--- common/log | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)common/log +0
-0
common/log _scratch_dump_log() · line 232
Quoted 5 lines
common/log +1
-1@@ -229,7 +229,7 @@ _scratch_dump_log() $DUMP_F2FS_PROG $SCRATCH_DEV ;; ext4) - $DUMPE2FS_PROG -h $SCRATCH_DEV + $DEBUGFS_PROG -R "logdump -a" $SCRATCH_DEV
Hmm. Some of the tests call _require_command on various e2fsprogs programs. However, debugfs has been a part of e2fsprogs since forever and e2fsprogs is a required fstests dependency, so I guess those callsites are unnecessary (but otherwise benign). For that matter, I think e2fsprogs is an 'essential' package on Debian and almost always installed by Linux distros. I think that means it's safe to assume that debugfs is present.
--D
Quoted 15 lines
common/log +1
-1;; *) ;;@@ -246,7 +246,7 @@ _test_dump_log() $DUMP_F2FS_PROG $TEST_DEV ;; ext4) - $DUMPE2FS_PROG -h $TEST_DEV + $DEBUGFS_PROG -R "logdump -a" $TEST_DEV ;; *) ;;Signature · 1 line
2.25.1
Re: [External] : Re: [PATCH v2 4/4] common/log: Fix *_dump_log routines for ext4
Quoted 30 lines · Darrick J. Wong
Quoted 13 lines · Catherine Hoang
dumpe2fs -h displays the superblock contents, not the journal contents. Use the logdump utility to dump the contents of the journal.
Signed-off-by Catherine Hoang <[email protected]>---
common/log | 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)common/log +0
-0common/log _scratch_dump_log() · line 232
Quoted 5 lines
common/log +1
-1@@ -229,7 +229,7 @@ _scratch_dump_log() $DUMP_F2FS_PROG $SCRATCH_DEV ;; ext4) - $DUMPE2FS_PROG -h $SCRATCH_DEV + $DEBUGFS_PROG -R "logdump -a" $SCRATCH_DEVHmm. Some of the tests call
_require_commandon various e2fsprogs programs. However, debugfs has been a part of e2fsprogs since forever and e2fsprogs is a required fstests dependency, so I guess those callsites are unnecessary (but otherwise benign). For that matter, I think e2fsprogs is an 'essential' package on Debian and almost always installed by Linux distros. I think that means it's safe to assume that debugfs is present.
Quoted 3 lines
Reviewed-by Darrick J. Wong <[email protected]>—D
Thanks for the reviews Darrick!
Catherine
Quoted 17 lines
Quoted 17 lines
common/log +1
-1;; *) ;;@@ -246,7 +246,7 @@ _test_dump_log() $DUMP_F2FS_PROG $TEST_DEV ;; ext4) - $DUMPE2FS_PROG -h $TEST_DEV + $DEBUGFS_PROG -R "logdump -a" $TEST_DEV ;; *) ;;Signature · 1 line
2.25.1
Re: [PATCH v2 4/4] common/log: Fix *_dump_log routines for ext4
In reply to Catherine HoangQuoted 4 lines · Catherine Hoang
dumpe2fs -h displays the superblock contents, not the journal contents. Use the logdump utility to dump the contents of the journal.
Signed-off-by Catherine Hoang <[email protected]>
Looks good to me. Thanks for the fix
Quoted 27 lines
--- common/log | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)common/log +2
-2@@ -229,7 +229,7 @@ _scratch_dump_log() $DUMP_F2FS_PROG $SCRATCH_DEV ;; ext4) - $DUMPE2FS_PROG -h $SCRATCH_DEV + $DEBUGFS_PROG -R "logdump -a" $SCRATCH_DEV ;; *) ;;@@ -246,7 +246,7 @@ _test_dump_log() $DUMP_F2FS_PROG $TEST_DEV ;; ext4) - $DUMPE2FS_PROG -h $TEST_DEV + $DEBUGFS_PROG -R "logdump -a" $TEST_DEV ;; *) ;;
Re: [PATCH v2 4/4] common/log: Fix *_dump_log routines for ext4
Quoted 10 lines · Allison Henderson
Quoted 3 lines · Catherine Hoang
dumpe2fs -h displays the superblock contents, not the journal contents. Use the logdump utility to dump the contents of the journal.
Signed-off-by Catherine Hoang <[email protected]>Looks good to me. Thanks for the fix
Reviewed-by Allison Henderson <[email protected]>
Thanks for the review!
Catherine
Quoted 26 lines
Quoted 26 lines
--- common/log | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)common/log +2
-2@@ -229,7 +229,7 @@ _scratch_dump_log() $DUMP_F2FS_PROG $SCRATCH_DEV ;; ext4) - $DUMPE2FS_PROG -h $SCRATCH_DEV + $DEBUGFS_PROG -R "logdump -a" $SCRATCH_DEV ;; *) ;;@@ -246,7 +246,7 @@ _test_dump_log() $DUMP_F2FS_PROG $TEST_DEV ;; ext4) - $DUMPE2FS_PROG -h $TEST_DEV + $DEBUGFS_PROG -R "logdump -a" $TEST_DEV ;; *) ;;