xfs: annotate fix commits for upcoming 5.10.y backports

In preparation for backporting xfs fixes to stable kernel 5.10.y,
annotate some of the tests that pass after applying the backports.

Most of the annotated tests have the fix commit documented either
in comment or in commit message already.

All tests have been verified to pass with fix commits apply, but
for a few tests, a failure was observed when running on kernel without
the documented fix commit. That is probably because failure happens
only on a specific setup.

Generic tests have also been annotated with xfs fix commits.
That may produce wrong hints if the test fails on another fs, but
that is what hints are for - to give tester a hint, so if tester is
not testing xfs, it's easy to figure out that the hint is irrelevant.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/623 b/tests/generic/623
index 324251b7c642eb13d800d14792eb14ef9dc3cdc7..ea016d91a1c651ffa31dd6cf03a08f18d0677934 100755 (executable)
--- a/tests/generic/623
+++ b/tests/generic/623
@@ -12,6 +12,9 @@ _begin_fstest auto quick shutdown
 . ./common/filter
 
 _supported_fs generic
+_fixed_by_kernel_commit e4826691cc7e \
+       "xfs: restore shutdown check in mapped write fault path"
+
 _require_scratch_nocheck
 _require_scratch_shutdown
 

diff --git a/tests/generic/631 b/tests/generic/631
index 219f7a05e7fc4ba0fd66c949aa9bd90c53a266ac..ff1bb11301b62976de079f9e633187ca0d888e5a 100755 (executable)
--- a/tests/generic/631
+++ b/tests/generic/631
@@ -40,6 +40,8 @@ _require_scratch
 _require_attrs trusted
 _supported_fs ^overlay
 _require_extra_fs overlay
+_fixed_by_kernel_commit 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 79d3f17cb4ed9313c426f5ade9bcec51236726a9..027df5570f81ca5c56762b3ffac14c64f82b17fa 100755 (executable)
--- a/tests/generic/646
+++ b/tests/generic/646
@@ -15,6 +15,9 @@
 _begin_fstest auto quick recoveryloop shutdown
 
 # real QA test starts here
+_supported_fs generic
+_fixed_by_kernel_commit 50d25484bebe \
+       "xfs: sync lazy sb accounting on quiesce of read-only mounts"
 
 _require_scratch
 _require_scratch_shutdown

diff --git a/tests/generic/649 b/tests/generic/649
index a6aabfaf724233837c1aa43b54728c647606bbe7..d6727765d7a3ae98ae1bc7fec6e9f637c72be1a2 100755 (executable)
--- a/tests/generic/649
+++ b/tests/generic/649
@@ -33,6 +33,9 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs generic
+_fixed_by_kernel_commit 72a048c1056a \
+       "xfs: only set IOMAP_F_SHARED when providing a srcmap to a write"
+
 _require_cp_reflink
 _require_test_reflink
 _require_test_program "punch-alternating"

diff --git a/tests/xfs/145 b/tests/xfs/145
index d32e726e7e5582ff206d5efebff9486b14ae3a36..5fd8dcadfcb05ab95cf2d6b484cda7dcb6d63995 100755 (executable)
--- a/tests/xfs/145
+++ b/tests/xfs/145
@@ -18,6 +18,9 @@ _begin_fstest auto quick quota
 
 # real QA test starts here
 _supported_fs xfs
+_fixed_by_kernel_commit 1aecf3734a95 \
+       "xfs: fix chown leaking delalloc quota blocks when fssetxattr fails"
+
 _require_command "$FILEFRAG_PROG" filefrag
 _require_test_program "chprojid_fail"
 _require_quota

diff --git a/tests/xfs/177 b/tests/xfs/177
index 10891550853af7f42de8ff78d2ecfaffc158042b..1e59bd6c507e773ae856441093ccad755da3a000 100755 (executable)
--- a/tests/xfs/177
+++ b/tests/xfs/177
@@ -39,6 +39,8 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
+_fixed_by_kernel_commit f38a032b165d "xfs: fix I_DONTCACHE"
+
 _require_xfs_io_command "bulkstat"
 _require_scratch
 

diff --git a/tests/xfs/513 b/tests/xfs/513
index bfdfd4f612991573e5851ead82fce7643dbe7242..85500af0ebe2744f138900b3a25cf7b95730f96b 100755 (executable)
--- a/tests/xfs/513
+++ b/tests/xfs/513
@@ -31,6 +31,9 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
+_fixed_by_kernel_commit 237d7887ae72 \
+       "xfs: show the proper user quota options"
+
 _require_test
 _require_loop
 _require_xfs_io_command "falloc"

diff --git a/tests/xfs/539 b/tests/xfs/539
index 4bc52c1ae8671635ec7ba87abd5bb642869dd106..77b44c89244318e01585f1540b6ed4e39cd57a3f 100755 (executable)
--- a/tests/xfs/539
+++ b/tests/xfs/539
@@ -9,15 +9,18 @@
 # the same value as during the mount
 #
 # Regression test for commit:
-# xfs: Skip repetitive warnings about mount options
+# 92cf7d36384b xfs: Skip repetitive warnings about mount options
 
 . ./common/preamble
 _begin_fstest auto quick mount
 
 # Import common functions.
 
-_require_check_dmesg
 _supported_fs xfs
+_fixed_by_kernel_commit 92cf7d36384b \
+       "xfs: Skip repetitive warnings about mount options"
+
+_require_check_dmesg
 _require_scratch
 
 log_tag()

diff --git a/tests/xfs/542 b/tests/xfs/542
index 5c45eed7cdabfcb42ce1e797ac47f5f0cee55146..1540541ec4c942431ebb9f6dde73c493406ea5ef 100755 (executable)
--- a/tests/xfs/542
+++ b/tests/xfs/542
@@ -26,6 +26,9 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
+_fixed_by_kernel_commit 5ca5916b6bc9 \
+       "xfs: punch out data fork delalloc blocks on COW writeback failure"
+
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "cowextsize"