fstests: 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.

Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/inject b/common/inject
index 984ec209281da1cae8d9ee8e0ea9c57e3097059f..3b731df74ad05174c556a07c999f94f9fdd86128 100644 (file)
--- a/common/inject
+++ b/common/inject
@@ -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"
 

diff --git a/tests/xfs/312 b/tests/xfs/312
index 1fcf26abaa64ab637ff4c153e748c857fb5eb3a0..94f868fe91c8be608eeecc83188dc00f8afbef97 100755 (executable)
--- a/tests/xfs/312
+++ b/tests/xfs/312
@@ -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

diff --git a/tests/xfs/313 b/tests/xfs/313
index 6d2f9facf86394e2d9824135884a4f567cd44440..9c7cf5b94a7579806965c2f840b2d3cfd50312de 100755 (executable)
--- a/tests/xfs/313
+++ b/tests/xfs/313
@@ -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

diff --git a/tests/xfs/314 b/tests/xfs/314
index 5165393e7e0c8d3c2041ecd17f6ee8a87577b28b..9ac311d0cc1346ecf90250cfcc2ad8d7831649c5 100755 (executable)
--- a/tests/xfs/314
+++ b/tests/xfs/314
@@ -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

diff --git a/tests/xfs/315 b/tests/xfs/315
index 958a8c99c21f0722e25f362d94952e46dc721f14..105515ab0ce2f5054322e08cba0b028dee84c8e7 100755 (executable)
--- a/tests/xfs/315
+++ b/tests/xfs/315
@@ -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

diff --git a/tests/xfs/316 b/tests/xfs/316
index cf0c5adcb90df51ae2392933f845b2124a62fdf0..f0af19d2542beeed8d71da82b3d97d452820e7e8 100755 (executable)
--- a/tests/xfs/316
+++ b/tests/xfs/316
@@ -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

diff --git a/tests/xfs/317 b/tests/xfs/317
index 7eef67af33fea2daff2a6f46bc0f02a76769d91c..1ca2672d111743120f43333301cd2125aafac0de 100755 (executable)
--- a/tests/xfs/317
+++ b/tests/xfs/317
@@ -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

diff --git a/tests/xfs/318 b/tests/xfs/318
index d822e89a6dfe71dd9b2c732881f8f574f728fff4..38c7aa6016b4cf79bac0a61db488427340bdd510 100755 (executable)
--- a/tests/xfs/318
+++ b/tests/xfs/318
@@ -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

diff --git a/tests/xfs/319 b/tests/xfs/319
index 0f61c119de1f12521f56dc183f9e7feb6cba0d94..d64651fbfc08d7f7980aae6277ef1c1df8aecc5c 100755 (executable)
--- a/tests/xfs/319
+++ b/tests/xfs/319
@@ -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

diff --git a/tests/xfs/320 b/tests/xfs/320
index f65f3ad1943da8e8216458f4dca986fb2cfe6d0d..d22d76d972b46a32b452050af3677827eb4725ae 100755 (executable)
--- a/tests/xfs/320
+++ b/tests/xfs/320
@@ -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

diff --git a/tests/xfs/321 b/tests/xfs/321
index daff4449e71b3483d5e98acf0aad7583d404f03d..06a343478c847dbdbb48efecef3f8dff5438e1c9 100755 (executable)
--- a/tests/xfs/321
+++ b/tests/xfs/321
@@ -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

diff --git a/tests/xfs/322 b/tests/xfs/322
index f36e54d815bb6c437377cf0bd06536a585ed5d1a..89a2f7413131446ccacc56ae701d4cec8922ba28 100755 (executable)
--- a/tests/xfs/322
+++ b/tests/xfs/322
@@ -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

diff --git a/tests/xfs/323 b/tests/xfs/323
index f66a8ebf3c62e2117bdca6edddef3d3c6bc892ee..66737da0b48e01db6f11743a3f2794b200202091 100755 (executable)
--- a/tests/xfs/323
+++ b/tests/xfs/323
@@ -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

diff --git a/tests/xfs/324 b/tests/xfs/324
index ca2f25acc623e109c74a5c22d71695d5a57d21bf..9909db62127d143a674b5c508c3090c099ef642d 100755 (executable)
--- a/tests/xfs/324
+++ b/tests/xfs/324
@@ -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

diff --git a/tests/xfs/325 b/tests/xfs/325
index 3b98fd50c4b16d7793ab8b0bf0cbba5c70338d18..5b26b2b37f385f4ae7a8b65a78ba5b552785ad21 100755 (executable)
--- a/tests/xfs/325
+++ b/tests/xfs/325
@@ -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

diff --git a/tests/xfs/326 b/tests/xfs/326
index bf5db08abc9b094548a4a29f62689fca922c97f6..8b95a18a203b8e6f6032f8c0a51f637853f034b9 100755 (executable)
--- a/tests/xfs/326
+++ b/tests/xfs/326
@@ -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

diff --git a/tests/xfs/329 b/tests/xfs/329
index e57f6f7f7e6c2a5fda79187bdad6a43c9f1a8c32..e9a30d05901502bf573fab2c1cd183261f1618a4 100755 (executable)
--- a/tests/xfs/329
+++ b/tests/xfs/329
@@ -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