generic: suggest fs specific fix only if the tested filesystem matches

It's odd when a test fails on a filesystem and a specific fix is suggested
for another filesystem. Some generic tests are suggesting filesystem
specific fixes without checking if the running filesystem matches, so
update them.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/365 b/tests/generic/365
index 1f6a618ae6ba3ebd89f247a27b3c60ca3c67d9b2..1bca848a7907b4e44495dad1be8de78f7fd0fba7 100755 (executable)
--- a/tests/generic/365
+++ b/tests/generic/365
@@ -9,10 +9,12 @@
 . ./common/preamble
 _begin_fstest auto rmap fsmap
 
-_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"
+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"
+fi
 
 . ./common/filter
 

diff --git a/tests/generic/366 b/tests/generic/366
index b322bcca72fecc163e6b54718a278668d3cb53ae..b2c2e607d6bba22fd292be968640affb3c094a66 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
 
-_fixed_by_kernel_commit xxxxxxxxxxxx \
+[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 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 7cf90695440855428d09242b37e32036762d76ca..ed371a02bac2fea12c00d9f36d4fe090173cf2ac 100755 (executable)
--- a/tests/generic/367
+++ b/tests/generic/367
@@ -17,7 +17,7 @@
 
 _begin_fstest ioctl quick
 
-_fixed_by_kernel_commit 2a492ff66673 \
+[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 2a492ff66673 \
        "xfs: Check for delayed allocations before setting extsize"
 
 _require_scratch_extsize

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

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

diff --git a/tests/generic/646 b/tests/generic/646
index dc73aeb326403255ab66c219cad9695051a6b806..b3b0ab0ace56b5786c7c1ea0ccd6de47a9263447 100755 (executable)
--- a/tests/generic/646
+++ b/tests/generic/646
@@ -14,7 +14,7 @@
 . ./common/preamble
 _begin_fstest auto quick recoveryloop shutdown
 
-_fixed_by_kernel_commit 50d25484bebe \
+[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 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 a33b13eaa7f9ca74585440b36666dacc8ac008fc..58ef96a8a12ab3e4143f15afb04128c6de5e9b9e 100755 (executable)
--- a/tests/generic/649
+++ b/tests/generic/649
@@ -31,7 +31,7 @@ _cleanup()
 
 
 # Modify as appropriate.
-_fixed_by_kernel_commit 72a048c1056a \
+[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 72a048c1056a \
        "xfs: only set IOMAP_F_SHARED when providing a srcmap to a write"
 
 _require_cp_reflink

diff --git a/tests/generic/695 b/tests/generic/695
index df81fdb7fea8f9ede1f84aa7549c283aaa3457a8..694f424545119daec1466baac1f84a328bd919eb 100755 (executable)
--- a/tests/generic/695
+++ b/tests/generic/695
@@ -25,7 +25,7 @@ _cleanup()
 . ./common/dmflakey
 . ./common/punch
 
-_fixed_by_kernel_commit e6e3dec6c3c288 \
+[ "$FSTYP" = "btrfs" ] && _fixed_by_kernel_commit 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 052cfbd628deb1c0160c6e39781705a9275d9c28..7f84df9df40a36a884f98a7153995b527377977d 100755 (executable)
--- a/tests/generic/700
+++ b/tests/generic/700
@@ -19,8 +19,8 @@ _require_scratch
 _require_attrs
 _require_renameat2 whiteout
 
-_fixed_by_kernel_commit 70b589a37e1a \
-       xfs: add selinux labels to whiteout inodes
+[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 70b589a37e1a \
+       "xfs: add selinux labels to whiteout inodes"
 
 get_selinux_label()
 {

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

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

diff --git a/tests/generic/704 b/tests/generic/704
index f452f9e9c0dc4c360bc0908755e80595523596e5..f2360c42e40dd1fc1b418c222e1c612440de2671 100755 (executable)
--- a/tests/generic/704
+++ b/tests/generic/704
@@ -21,7 +21,9 @@ _cleanup()
 # Import common functions.
 . ./common/scsi_debug
 
-_fixed_by_kernel_commit 7c71ee78031c "xfs: allow logical-sector sized O_DIRECT"
+[ "$FSTYP" = "xfs" ] && _fixed_by_kernel_commit 7c71ee78031c \
+       "xfs: allow logical-sector sized O_DIRECT"
+
 _require_scsi_debug
 # If TEST_DEV is block device, make sure current fs is a localfs which can be
 # written on scsi_debug device

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