fstests: use _fixed_by_fs_commit where appropriate

Use the newly introduced _fixed_by_fs_commit function where appropriate.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/211 b/tests/generic/211
index f356d13b1c6a69a44ce38ea0a09493f0768baf88..ee73a59dffb015cf6b1a64f64046209bfec0438f 100755 (executable)
--- a/tests/generic/211
+++ b/tests/generic/211
@@ -15,7 +15,7 @@ _begin_fstest auto quick rw mmap
 
 _require_scratch
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 6599716de2d6 \
+_fixed_by_fs_commit btrfs 6599716de2d6 \
        "btrfs: fix -ENOSPC mmap write failure on NOCOW files/extents"
 
 # Use a 512M fs so that it's fast to fill it with data but not too small such

diff --git a/tests/generic/362 b/tests/generic/362
index 3a1993e81d4b28c1c296d06794304d041edf8439..0cfaa726be7025520ff3145d6478051b50d29044 100755 (executable)
--- a/tests/generic/362
+++ b/tests/generic/362
@@ -17,8 +17,7 @@ _require_test
 _require_odirect
 _require_test_program dio-append-buf-fault
 
-[ $FSTYP == "btrfs" ] && \
-       _fixed_by_kernel_commit 939b656bc8ab \
+_fixed_by_fs_commit btrfs 939b656bc8ab \
        "btrfs: fix corruption after buffer fault in during direct IO append write"
 
 # On error the test program writes messages to stderr, causing a golden output

diff --git a/tests/generic/363 b/tests/generic/363
index f361878a47e8294bcf814786f9087024e77806b6..3e58d864d4ee132349d0922c1172e57a1f3be92b 100755 (executable)
--- a/tests/generic/363
+++ b/tests/generic/363
@@ -13,12 +13,10 @@ _begin_fstest rw auto
 
 _require_test
 
-if [ $FSTYP == "btrfs" ]; then
-       _fixed_by_kernel_commit da2dccd7451d \
-               "btrfs: fix hole expansion when writing at an offset beyond EOF"
-       _fixed_by_kernel_commit 8e4f21f2b13d \
-               "btrfs: handle unaligned EOF truncation correctly for subpage cases"
-fi
+_fixed_by_fs_commit btrfs da2dccd7451d \
+       "btrfs: fix hole expansion when writing at an offset beyond EOF"
+_fixed_by_fs_commit btrfs 8e4f21f2b13d \
+       "btrfs: handle unaligned EOF truncation correctly for subpage cases"
 
 # on failure, replace -q with -d to see post-eof writes in the dump output
 run_fsx "-q -S 0 -e 1 -N 100000"

diff --git a/tests/generic/364 b/tests/generic/364
index 968b4754decaac04a8fea1da0b15ca5534d3f67d..f7fb002ff85815333db61dc30109ec13338668cb 100755 (executable)
--- a/tests/generic/364
+++ b/tests/generic/364
@@ -17,8 +17,7 @@ _require_test_program dio-write-fsync-same-fd
 _require_command "$TIMEOUT_PROG" timeout
 
 # Triggers very frequently with kernel config CONFIG_BTRFS_ASSERT=y.
-[ $FSTYP == "btrfs" ] && \
-       _fixed_by_kernel_commit cd9253c23aed \
+_fixed_by_fs_commit btrfs cd9253c23aed \
        "btrfs: fix race between direct IO write and fsync when using same fd"
 
 # On error the test program writes messages to stderr, causing a golden output

diff --git a/tests/generic/365 b/tests/generic/365
index 4acc4b01b584a1d341e007565d5526fd856399eb..0319ef1763dc42d932c09f4aed1716992afe8208 100755 (executable)
--- a/tests/generic/365
+++ b/tests/generic/365
@@ -9,15 +9,12 @@
 . ./common/preamble
 _begin_fstest auto rmap fsmap
 
-if [ "$FSTYP" = "xfs" ]; then
-       _fixed_by_kernel_commit 68415b349f3f \
-               "xfs: Fix the owner setting issue for rmap query in xfs fsmap"
-       _fixed_by_kernel_commit ca6448aed4f1 \
-               "xfs: Fix missing interval for missing_owner in xfs fsmap"
-elif [ "$FSTYP" = "ext4" ]; then
-       _fixed_by_kernel_commit 4a622e4d477b \
-               "ext4: fix FS_IOC_GETFSMAP handling"
-fi
+_fixed_by_fs_commit xfs 68415b349f3f \
+       "xfs: Fix the owner setting issue for rmap query in xfs fsmap"
+_fixed_by_fs_commit xfs ca6448aed4f1 \
+       "xfs: Fix missing interval for missing_owner in xfs fsmap"
+_fixed_by_fs_commit ext4 4a622e4d477b \
+       "ext4: fix FS_IOC_GETFSMAP handling"
 
 . ./common/filter
 

diff --git a/tests/generic/366 b/tests/generic/366
index b2c2e607d6bba22fd292be968640affb3c094a66..271a01bc2eac912f59326878cc1dc1cc59c863b2 100755 (executable)
--- a/tests/generic/366
+++ b/tests/generic/366
@@ -23,7 +23,7 @@ _require_scratch
 _require_odirect 512   # see fio job1 config below
 _require_aio
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit xxxxxxxxxxxx \
+_fixed_by_fs_commit btrfs xxxxxxxxxxxx \
        "btrfs: avoid deadlock when reading a partial uptodate folio"
 
 iterations=$((32 * LOAD_FACTOR))

diff --git a/tests/generic/367 b/tests/generic/367
index 567db5577898735470f9cb337833cada71ff98ed..0b3e67f1cdb8234071e13a7bf5a9181409bf9417 100755 (executable)
--- a/tests/generic/367
+++ b/tests/generic/367
@@ -16,7 +16,7 @@
 
 _begin_fstest ioctl quick
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 2a492ff66673 \
+_fixed_by_fs_commit xfs 2a492ff66673 \
        "xfs: Check for delayed allocations before setting extsize"
 
 _require_scratch_extsize

diff --git a/tests/generic/370 b/tests/generic/370
index d9ba6c57d5e9836ea6e3e7bd1018cb6509736d2d..b5d942de4f8856311c717c0e0a4bedd80b6a1b79 100755 (executable)
--- a/tests/generic/370
+++ b/tests/generic/370
@@ -19,10 +19,9 @@ _cleanup()
 
 . ./common/reflink
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 03018e5d8508 \
+_fixed_by_fs_commit btrfs 03018e5d8508 \
     "btrfs: fix swap file activation failure due to extents that used to be shared"
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 2d873efd174b \
-       "xfs: flush inodegc before swapon"
+_fixed_by_fs_commit xfs 2d873efd174b "xfs: flush inodegc before swapon"
 
 _require_scratch_swapfile
 _require_scratch_reflink

diff --git a/tests/generic/471 b/tests/generic/471
index e98e3f00c7c3eff18b5a9d35bda0704f95abc375..a1547e70d19c125f442798eb1a2f79debd63d877 100755 (executable)
--- a/tests/generic/471
+++ b/tests/generic/471
@@ -23,7 +23,7 @@ _cleanup()
 _require_test
 _require_test_program rewinddir-test
 
-[ $FSTYP == "btrfs" ] && _fixed_by_kernel_commit e60aa5da14d0 \
+_fixed_by_fs_commit btrfs e60aa5da14d0 \
        "btrfs: refresh dir last index during a rewinddir(3) call"
 
 target_dir="$TEST_DIR/test-$seq"

diff --git a/tests/generic/562 b/tests/generic/562
index b9562730eac98eb772adbe4e1c0d1d7906ef09d3..115f3d89ad98edf95f549746937012b726f7da0c 100755 (executable)
--- a/tests/generic/562
+++ b/tests/generic/562
@@ -15,8 +15,7 @@ _begin_fstest auto clone punch
 . ./common/filter
 . ./common/reflink
 
-test "$FSTYP" = "xfs" && \
-       _fixed_by_kernel_commit 7ce31f20a077 "xfs: don't drop errno values when we fail to ficlone the entire range"
+_fixed_by_fs_commit xfs 7ce31f20a077 "xfs: don't drop errno values when we fail to ficlone the entire range"
 
 _require_scratch_reflink
 _require_test_program "punch-alternating"

diff --git a/tests/generic/623 b/tests/generic/623
index f546d529a32f193e363813ac0106c41a5cf97e40..da884c72a4bcf8a32447af0d23f5526f0e45ae69 100755 (executable)
--- a/tests/generic/623
+++ b/tests/generic/623
@@ -11,7 +11,7 @@ _begin_fstest auto quick shutdown mmap
 
 . ./common/filter
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit e4826691cc7e \
+_fixed_by_fs_commit xfs e4826691cc7e \
        "xfs: restore shutdown check in mapped write fault path"
 
 _require_scratch_nocheck

diff --git a/tests/generic/631 b/tests/generic/631
index c38ab7712fdaac1ea9470bbc914eaa813d5e5e94..8b12b8f247ee818bfeb8b9c0767664c2095cece3 100755 (executable)
--- a/tests/generic/631
+++ b/tests/generic/631
@@ -41,8 +41,7 @@ _require_attrs trusted
 _exclude_fs overlay
 _require_extra_fs overlay
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 6da1b4b1ab36 \
-       "xfs: fix an ABBA deadlock in xfs_rename"
+_fixed_by_fs_commit xfs 6da1b4b1ab36 "xfs: fix an ABBA deadlock in xfs_rename"
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount

diff --git a/tests/generic/646 b/tests/generic/646
index 1e3f0cd54087fb889ea40176db4676fe93708277..90d6b1185f86cacfdf8560c76ddcdf3dd1ac70bd 100755 (executable)
--- a/tests/generic/646
+++ b/tests/generic/646
@@ -14,7 +14,7 @@
 . ./common/preamble
 _begin_fstest auto quick recoveryloop shutdown
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 50d25484bebe \
+_fixed_by_fs_commit xfs 50d25484bebe \
        "xfs: sync lazy sb accounting on quiesce of read-only mounts"
 
 _require_scratch

diff --git a/tests/generic/649 b/tests/generic/649
index 58ef96a8a12ab3e4143f15afb04128c6de5e9b9e..de45ad4e3bb4378ac85a97f6276fdc6fe23ea5ff 100755 (executable)
--- a/tests/generic/649
+++ b/tests/generic/649
@@ -31,7 +31,7 @@ _cleanup()
 
 
 # Modify as appropriate.
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 72a048c1056a \
+_fixed_by_fs_commit xfs 72a048c1056a \
        "xfs: only set IOMAP_F_SHARED when providing a srcmap to a write"
 
 _require_cp_reflink

diff --git a/tests/generic/650 b/tests/generic/650
index 2e051b7315684256fb65ff0010d0b40b7e3fcae3..48f81dcb5c21ac51241ecaae2059ed694ec6420f 100755 (executable)
--- a/tests/generic/650
+++ b/tests/generic/650
@@ -10,7 +10,7 @@
 . ./common/preamble
 _begin_fstest auto rw stress soak
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit ecd49f7a36fb \
+_fixed_by_fs_commit xfs ecd49f7a36fb \
         "xfs: fix per-cpu CIL structure aggregation racing with dying cpus"
 
 # Override the default cleanup function.

diff --git a/tests/generic/695 b/tests/generic/695
index 78271e7b0970e781cc0ffcfcbd145afdf639de81..8eb103098bba72ef4b8e11734c8d9d7b8e9442f3 100755 (executable)
--- a/tests/generic/695
+++ b/tests/generic/695
@@ -25,7 +25,7 @@ _cleanup()
 . ./common/dmflakey
 . ./common/punch
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit e6e3dec6c3c288 \
+_fixed_by_fs_commit btrfs e6e3dec6c3c288 \
         "btrfs: update generation of hole file extent item when merging holes"
 _require_scratch
 _require_dm_target flakey

diff --git a/tests/generic/700 b/tests/generic/700
index 7f84df9df40a36a884f98a7153995b527377977d..8747b7be037a61bfe56edc1c2dfc091db8316705 100755 (executable)
--- a/tests/generic/700
+++ b/tests/generic/700
@@ -19,7 +19,7 @@ _require_scratch
 _require_attrs
 _require_renameat2 whiteout
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 70b589a37e1a \
+_fixed_by_fs_commit xfs 70b589a37e1a \
        "xfs: add selinux labels to whiteout inodes"
 
 get_selinux_label()

diff --git a/tests/generic/701 b/tests/generic/701
index 806cc65dd77eb0e1806c813cabb5d6dd4d5ac5ca..62dda8595ac10eb1e8952b9804a4267009ebaeae 100755 (executable)
--- a/tests/generic/701
+++ b/tests/generic/701
@@ -22,7 +22,7 @@ _cleanup()
        rm -r -f $tmp.* $junk_dir
 }
 
-[ "$FSTYP" = "exfat" ] && _fixed_by_kernel_commit 92fba084b79e \
+_fixed_by_fs_commit exfat 92fba084b79e \
        "exfat: fix i_blocks for files truncated over 4 GiB"
 
 _require_test

diff --git a/tests/generic/702 b/tests/generic/702
index ae47eb27dfb3218e744dcc7ce6d650eee2f51486..8c3e2b49a12b19b45da505a266f36573bcc011b4 100755 (executable)
--- a/tests/generic/702
+++ b/tests/generic/702
@@ -14,7 +14,7 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit ac3c0d36a2a2f7 \
+_fixed_by_fs_commit btrfs ac3c0d36a2a2f7 \
        "btrfs: make fiemap more efficient and accurate reporting extent sharedness"
 
 _require_scratch_reflink

diff --git a/tests/generic/703 b/tests/generic/703
index 30afe6da711a090f4fef2821b2bbfc536e8ecd5e..3448066267312d5771f053daf638a5f6f6b0aa60 100755 (executable)
--- a/tests/generic/703
+++ b/tests/generic/703
@@ -23,8 +23,7 @@ fio_config=$tmp.fio
 fio_out=$tmp.fio.out
 test_file="${SCRATCH_MNT}/foo"
 
-[ $FSTYP == "btrfs" ] &&
-       _fixed_by_kernel_commit 8184620ae212 \
+_fixed_by_fs_commit btrfs 8184620ae212 \
        "btrfs: fix lost file sync on direct IO write with nowait and dsync iocb"
 
 # We allocate 256M of data for the test file, so require a higher size of 512M

diff --git a/tests/generic/704 b/tests/generic/704
index f2360c42e40dd1fc1b418c222e1c612440de2671..d0d7f12394894b387b002a2242c333658e331f34 100755 (executable)
--- a/tests/generic/704
+++ b/tests/generic/704
@@ -21,7 +21,7 @@ _cleanup()
 # Import common functions.
 . ./common/scsi_debug
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 7c71ee78031c \
+_fixed_by_fs_commit xfs 7c71ee78031c \
        "xfs: allow logical-sector sized O_DIRECT"
 
 _require_scsi_debug

diff --git a/tests/generic/706 b/tests/generic/706
index ce248814f87198dbf23b2d5a7f56262da79715c3..30d06ef9a732aec4d0ab54127f0e619b37067317 100755 (executable)
--- a/tests/generic/706
+++ b/tests/generic/706
@@ -10,8 +10,7 @@
 . ./common/preamble
 _begin_fstest auto quick seek
 
-[ $FSTYP == "btrfs" ] &&
-       _fixed_by_kernel_commit 2f2e84ca6066 \
+_fixed_by_fs_commit btrfs 2f2e84ca6066 \
        "btrfs: fix off-by-one in delalloc search during lseek"
 
 _require_test

diff --git a/tests/generic/707 b/tests/generic/707
index ed392a1b5bff5093414dc4d5ec0b0f626306faf3..33737ee1673ac698f76b919606f34d20a3b43779 100755 (executable)
--- a/tests/generic/707
+++ b/tests/generic/707
@@ -13,7 +13,7 @@ _begin_fstest auto
 
 _require_scratch
 
-[ "$FSTYP" = "udf" ] && _fixed_by_kernel_commit f950fd052913 \
+_fixed_by_fs_commit udf f950fd052913 \
        "udf: Protect rename against modification of moved directory"
 [[ "$FSTYP" =~ ext[0-9]+ ]] && _fixed_by_kernel_commit 0813299c586b \
        "ext4: Fix possible corruption when moving a directory"

diff --git a/tests/generic/708 b/tests/generic/708
index ec7e48a9f274145dfa1a67e55d558898165e878c..827dac134b92055cf0efc83acac7483fb084f6e0 100755 (executable)
--- a/tests/generic/708
+++ b/tests/generic/708
@@ -14,8 +14,7 @@
 . ./common/preamble
 _begin_fstest quick auto mmap
 
-[ $FSTYP == "btrfs" ] && \
-       _fixed_by_kernel_commit b73a6fd1b1ef \
+_fixed_by_fs_commit btrfs b73a6fd1b1ef \
                "btrfs: split partial dio bios before submit"
 
 _require_test

diff --git a/tests/generic/733 b/tests/generic/733
index 21347d51b4d29bf63cfd30024715595157e51852..01ede8003d609861b4666f2d1f3404799828a3ef 100755 (executable)
--- a/tests/generic/733
+++ b/tests/generic/733
@@ -25,16 +25,10 @@ _require_test_program "punch-alternating"
 _require_test_program "t_reflink_read_race"
 _require_command "$TIMEOUT_PROG" timeout
 
-case "$FSTYP" in
-"btrfs")
-       _fixed_by_kernel_commit 5d6f0e9890ed \
+_fixed_by_fs_commit btrfs 5d6f0e9890ed \
                "btrfs: stop locking the source extent range during reflink"
-       ;;
-"xfs")
-       _fixed_by_kernel_commit 14a537983b22 \
+_fixed_by_fs_commit xfs 14a537983b22 \
                "xfs: allow read IO and FICLONE to run concurrently"
-       ;;
-esac
 
 rm -f "$seqres.full"
 

diff --git a/tests/generic/736 b/tests/generic/736
index 2fe7ba8e5ae9d949d5bc17b68568a00d6321e8ed..95bdcfbe723d4a25dcefc97a30867956a208fd7b 100755 (executable)
--- a/tests/generic/736
+++ b/tests/generic/736
@@ -21,7 +21,7 @@ _cleanup()
 _require_test
 _require_test_program readdir-while-renames
 
-[ $FSTYP = "btrfs" ] && _fixed_by_kernel_commit 9b378f6ad48c \
+_fixed_by_fs_commit btrfs 9b378f6ad48c \
        "btrfs: fix infinite directory reads"
 
 target_dir="$TEST_DIR/test-$seq"

diff --git a/tests/generic/738 b/tests/generic/738
index b0503025147d923d56753b1c2f39949599ddd4be..3c1599c0545988a36a44863ae5970c2324b22f66 100755 (executable)
--- a/tests/generic/738
+++ b/tests/generic/738
@@ -9,7 +9,7 @@
 . ./common/preamble
 _begin_fstest auto quick freeze
 
-[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit ab23a7768739 \
+_fixed_by_fs_commit xfs ab23a7768739 \
        "xfs: per-cpu deferred inode inactivation queues"
 
 _cleanup()

diff --git a/tests/generic/741 b/tests/generic/741
index 9bde8cbdd9b133d2e4c48d03dad2b011896b7484..a2fbde365a4cfd2c501d705199386b2e8e2d99a7 100755 (executable)
--- a/tests/generic/741
+++ b/tests/generic/741
@@ -33,7 +33,7 @@ _require_test
 _require_scratch
 _require_dm_target flakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 2f1aeab9fca1 \
+_fixed_by_fs_commit btrfs 2f1aeab9fca1 \
                        "btrfs: return accurate error code on open failure"
 
 _scratch_mkfs >> $seqres.full

diff --git a/tests/generic/742 b/tests/generic/742
index ceecbdf9edd49a72523bce2657f825f5fbd5ae73..52f0c3c39a9dc78d11da8288180759e46f1a4a48 100755 (executable)
--- a/tests/generic/742
+++ b/tests/generic/742
@@ -14,8 +14,7 @@
 . ./common/preamble
 _begin_fstest quick auto fiemap mmap
 
-[ $FSTYP == "btrfs" ] && \
-       _fixed_by_kernel_commit b0ad381fa769 \
+_fixed_by_fs_commit btrfs b0ad381fa769 \
                "btrfs: fix deadlock with fiemap and extent locking"
 
 _cleanup()

diff --git a/tests/generic/748 b/tests/generic/748
index 062e29aa3165583c580ca51c6993694dc9626c80..9ea596e0670b9ef53b61c647409a2f04423247c2 100755 (executable)
--- a/tests/generic/748
+++ b/tests/generic/748
@@ -16,7 +16,7 @@ _require_scratch
 _require_attrs
 _require_odirect
 _require_xfs_io_command falloc -k
-[ "$FSTYP" = btrfs ] && _fixed_by_kernel_commit 9d274c19a71b \
+_fixed_by_fs_commit btrfs 9d274c19a71b \
        "btrfs: fix crash on racing fsync and size-extending write into prealloc"
 
 # -i slows down xfs_io startup and makes the race much less reliable.

diff --git a/tests/generic/755 b/tests/generic/755
index b2fd3e58f5dfe2ac81ae0baf11443b02c893363d..59df6bd869626bbe118cbcd419be85d09091b14a 100755 (executable)
--- a/tests/generic/755
+++ b/tests/generic/755
@@ -12,7 +12,7 @@ _begin_fstest auto quick
 
 _require_hardlinks
 _require_test
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 3bc2ac2f8f0b \
+_fixed_by_fs_commit btrfs 3bc2ac2f8f0b \
        "btrfs: update target inode's ctime on unlink"
 
 testfile="$TEST_DIR/unlink-ctime1.$$"

diff --git a/tests/generic/757 b/tests/generic/757
index 11398d8677f72bb5b74ff592e3aada7c6260e655..98574114e89050e2a2325ad10dbe22a9f75bd7f8 100755 (executable)
--- a/tests/generic/757
+++ b/tests/generic/757
@@ -19,7 +19,7 @@ _cleanup()
 }
 
 
-[ $FSTYP = "btrfs" ] && _fixed_by_kernel_commit e917ff56c8e7 \
+_fixed_by_fs_commit btrfs e917ff56c8e7 \
        "btrfs: determine synchronous writers from bio or writeback control"
 
 fio_config=$tmp.fio

diff --git a/tests/generic/761 b/tests/generic/761
index bd7b02a9be349ee289653c07097f407822a24a75..e9030f3c6ab34187ce5d81088681d68693255a3c 100755 (executable)
--- a/tests/generic/761
+++ b/tests/generic/761
@@ -19,7 +19,7 @@ _require_scratch
 _require_odirect
 _require_test_program dio-writeback-race
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 968f19c5b1b7 \
+_fixed_by_fs_commit btrfs 968f19c5b1b7 \
        "btrfs: always fallback to buffered write if the inode requires checksum"
 
 _scratch_mkfs > $seqres.full 2>&1

diff --git a/tests/generic/763 b/tests/generic/763
index d78537ef324c6bf7ba0a41a046f3ee71d0f19e37..e5e1ccb10050d2f5b03428dfc56a67e6ddf2fb6e 100755 (executable)
--- a/tests/generic/763
+++ b/tests/generic/763
@@ -16,7 +16,7 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-[ "$FSTYP" = "exfat" ] && _fixed_by_kernel_commit dda0407a2026 \
+_fixed_by_fs_commit exfat dda0407a2026 \
        "exfat: short-circuit zero-byte writes in exfat_file_write_iter"
 
 # Modify as appropriate.

diff --git a/tests/generic/764 b/tests/generic/764
index b23f86e501f70049bae0432073fca50382823e05..dd86b69e5a72159ddf1a8911a9fb9dac250e3fb4 100755 (executable)
--- a/tests/generic/764
+++ b/tests/generic/764
@@ -20,7 +20,7 @@ _cleanup()
 
 . ./common/dmflakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 5e85262e542d \
+_fixed_by_fs_commit btrfs 5e85262e542d \
        "btrfs: fix fsync of files with no hard links not persisting deletion"
 
 _require_scratch

diff --git a/tests/generic/766 b/tests/generic/766
index 3b6911f0bdb902007adc55f389c0837faec9e065..85c89ea71f082068c593855d00bc4172fd2d673a 100755 (executable)
--- a/tests/generic/766
+++ b/tests/generic/766
@@ -32,12 +32,10 @@ _cleanup()
 
 _exclude_fs ext2
 
-[ $FSTYP == "ext4" ] && \
-        _fixed_by_kernel_commit 273108fa5015 \
-        "ext4: handle read only external journal device"
+_fixed_by_fs_commit ext4 273108fa5015 \
+       "ext4: handle read only external journal device"
 
-[ $FSTYP == "xfs" ] && \
-        _fixed_by_kernel_commit bfecc4091e07 \
+_fixed_by_fs_commit xfs bfecc4091e07 \
         "xfs: allow ro mounts if rtdev or logdev are read-only"
 
 _require_scratch_nocheck

diff --git a/tests/generic/771 b/tests/generic/771
index 1028c6d8c7e1e6b859aec5d116f53d25054f37c0..2fff25f89c7c9b20d49d4d8c209441827d7b13b7 100755 (executable)
--- a/tests/generic/771
+++ b/tests/generic/771
@@ -25,7 +25,7 @@ _require_scratch
 _require_test_program unlink-fsync
 _require_dm_target flakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 0a32e4f0025a \
+_fixed_by_fs_commit btrfs 0a32e4f0025a \
        "btrfs: fix log tree replay failure due to file with 0 links and extents"
 
 _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"

diff --git a/tests/generic/779 b/tests/generic/779
index 770a2e00b97cd7c6e55a6df54780c266e3498189..6505b4f42267b6f141a7b5fd95e9daa88a67cae1 100755 (executable)
--- a/tests/generic/779
+++ b/tests/generic/779
@@ -24,7 +24,7 @@ _require_scratch
 _require_symlinks
 _require_dm_target flakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 953902e4fb4c \
+_fixed_by_fs_commit btrfs 953902e4fb4c \
        "btrfs: set inode flag BTRFS_INODE_COPY_EVERYTHING when logging new name"
 
 rm -f $seqres.full

diff --git a/tests/generic/782 b/tests/generic/782
index 710fca701cbdc08872b47f81bcab1f967a3f24e3..f3298a70afc0bec9b4150d5bbc07d32164344bba 100755 (executable)
--- a/tests/generic/782
+++ b/tests/generic/782
@@ -25,7 +25,7 @@ _cleanup()
 _require_scratch
 _require_dm_target flakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit bfe3d755ef7c \
+_fixed_by_fs_commit btrfs bfe3d755ef7c \
        "btrfs: do not update last_log_commit when logging inode due to a new name"
 
 _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed"

diff --git a/tests/generic/784 b/tests/generic/784
index f7fb6272084db00007612c440af06147ffcdafdc..1ecbb28d27e73d5d561d1fc5056a88a227315c64 100755 (executable)
--- a/tests/generic/784
+++ b/tests/generic/784
@@ -25,7 +25,7 @@ _cleanup()
 _require_scratch
 _require_dm_target flakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 266273eaf4d9 \
+_fixed_by_fs_commit btrfs 266273eaf4d9 \
        "btrfs: don't log conflicting inode if it's a dir moved in the current transaction"
 
 _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed"

diff --git a/tests/generic/785 b/tests/generic/785
index 6c3a1c36e408bf9e972294f771784a7468c5f451..57bb5fe3b123829d5c6a47159e91cc38ac40381e 100755 (executable)
--- a/tests/generic/785
+++ b/tests/generic/785
@@ -27,7 +27,7 @@ _require_scratch
 _require_dm_target flakey
 _require_fssum
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 5630f7557de6 \
+_fixed_by_fs_commit btrfs 5630f7557de6 \
        "btrfs: do not skip logging new dentries when logging a new name"
 
 _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed"

diff --git a/tests/generic/789 b/tests/generic/789
index 1d2e3c0f7b2b8be1dcbedbee185d66ff161400d9..1ed7a885c0d19c1b44616c4de393ff18713f1bec 100755 (executable)
--- a/tests/generic/789
+++ b/tests/generic/789
@@ -24,7 +24,7 @@ _cleanup()
 _require_scratch
 _require_dm_target flakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit xxxxxxxxxxxx \
+_fixed_by_fs_commit btrfs xxxxxxxxxxxx \
        "btrfs: fix zero size inode with non-zero size after log replay"
 
 _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed"

diff --git a/tests/generic/790 b/tests/generic/790
index c9bac6d06eb687ef02667678f21dd733a8dc5124..9aa577f50383d925bc06122263cfcf56057fc5c8 100755 (executable)
--- a/tests/generic/790
+++ b/tests/generic/790
@@ -27,7 +27,7 @@ _cleanup()
 _require_scratch
 _require_dm_target flakey
 
-[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit xxxxxxxxxxxx \
+_fixed_by_fs_commit btrfs xxxxxxxxxxxx \
        "btrfs: log new dentries when logging parent dir of a conflicting inode"
 
 _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed"