aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand Jain <anand.jain@oracle.com>2023-09-21 13:22:16 +0800
committerZorro Lang <zlang@kernel.org>2023-09-23 02:23:28 +0800
commite3121832fc2ba3447662ad8821c99c548aa53de9 (patch)
tree1f27c8e85d4a2421fdff68f9a0586917895bf7f0
parent823613d666481fb0d4bd3611b14ef484664b4a88 (diff)
downloadxfstests-dev-e3121832fc2ba3447662ad8821c99c548aa53de9.tar.gz
btrfs: add missing _fixed_by_kernel_commit for a few tests
A few tests were still using the older style of mentioning the fix in the comment section. This patch migrates them to using _fixed_by_kernel_commit. Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: Zorro Lang <zlang@redhat.com> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rwxr-xr-xtests/btrfs/1996
-rwxr-xr-xtests/btrfs/2164
-rwxr-xr-xtests/btrfs/2186
-rwxr-xr-xtests/btrfs/2254
-rwxr-xr-xtests/btrfs/2385
5 files changed, 11 insertions, 14 deletions
diff --git a/tests/btrfs/199 b/tests/btrfs/199
index 709ad1f988..a4920b99ef 100755
--- a/tests/btrfs/199
+++ b/tests/btrfs/199
@@ -12,9 +12,6 @@
# There is a long existing bug that btrfs doesn't discard all space for
# above mentioned case.
#
-# The fix is: "btrfs: extent-tree: Ensure we trim ranges across block group
-# boundary"
-#
. ./common/preamble
_begin_fstest auto quick trim fiemap
@@ -34,6 +31,9 @@ _cleanup()
# Modify as appropriate.
_supported_fs btrfs
+_fixed_by_kernel_commit 6b7faadd985c \
+ "btrfs: Ensure we trim ranges across block group boundary"
+
_require_loop
_require_xfs_io_command "fiemap"
diff --git a/tests/btrfs/216 b/tests/btrfs/216
index 2ed4866887..979dcb73f0 100755
--- a/tests/btrfs/216
+++ b/tests/btrfs/216
@@ -6,8 +6,6 @@
#
# Test if the show_devname() returns sprout device instead of seed device.
#
-# Fixed in kernel patch:
-# btrfs: btrfs_show_devname don't traverse into the seed fsid
. ./common/preamble
_begin_fstest auto quick seed
@@ -17,6 +15,8 @@ _begin_fstest auto quick seed
# real QA test starts here
_supported_fs btrfs
+_fixed_by_kernel_commit 4faf55b03823 \
+ "btrfs: don't traverse into the seed devices in show_devname"
_require_scratch_dev_pool 2
_scratch_dev_pool_get 2
diff --git a/tests/btrfs/218 b/tests/btrfs/218
index 672ad0ff61..b0434834ff 100755
--- a/tests/btrfs/218
+++ b/tests/btrfs/218
@@ -4,10 +4,6 @@
#
# FS QA Test 218
#
-# Regression test for the problem fixed by the patch
-#
-# btrfs: init device stats for seed devices
-#
# Make a seed device, add a sprout to it, and then make sure we can still read
# the device stats for both devices after we remount with the new sprout device.
#
@@ -22,6 +18,8 @@ _begin_fstest auto quick volume
# Modify as appropriate.
_supported_fs btrfs
+_fixed_by_kernel_commit 124604eb50f8 \
+ "btrfs: init device stats for seed devices"
_require_test
_require_scratch_dev_pool 2
diff --git a/tests/btrfs/225 b/tests/btrfs/225
index cfb64a3426..677c162cb6 100755
--- a/tests/btrfs/225
+++ b/tests/btrfs/225
@@ -5,8 +5,6 @@
# FS QA Test 225
#
# Test for seed device-delete on a sprouted FS.
-# Requires kernel patch
-# b5ddcffa3777 btrfs: fix put of uninitialized kobject after seed device delete
#
# Steps:
# Create a seed FS. Add a RW device to make it sprout FS and then delete
@@ -30,6 +28,8 @@ _cleanup()
# Modify as appropriate.
_supported_fs btrfs
+_fixed_by_kernel_commit b5ddcffa3777 \
+ "btrfs: fix put of uninitialized kobject after seed device delete"
_require_test
_require_scratch_dev_pool 2
_require_btrfs_forget_or_module_loadable
diff --git a/tests/btrfs/238 b/tests/btrfs/238
index 57245917e1..3a711ea7a1 100755
--- a/tests/btrfs/238
+++ b/tests/btrfs/238
@@ -6,9 +6,6 @@
#
# Check seed device integrity after fstrim on the sprout device.
#
-# Kernel bug is fixed by the commit:
-# btrfs: fix unmountable seed device after fstrim
-
. ./common/preamble
_begin_fstest auto quick seed trim
@@ -19,6 +16,8 @@ _begin_fstest auto quick seed trim
# Modify as appropriate.
_supported_fs btrfs
+_fixed_by_kernel_commit 5e753a817b2d \
+ "btrfs: fix unmountable seed device after fstrim"
_require_command "$BTRFS_TUNE_PROG" btrfstune
_require_fstrim
_require_scratch_dev_pool 2