| Message ID | 34b81b45d31ac4f951a1eb218870f27e74920a75.1695272311.git.anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: add missing _fixed_by_kernel_commit for a few tests | expand |
On Thu, Sep 21, 2023 at 01:22:16PM +0800, Anand Jain wrote: > 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> > --- No objection from me. Reviewed-by: Zorro Lang <zlang@redhat.com> > tests/btrfs/199 | 6 +++--- > tests/btrfs/216 | 4 ++-- > tests/btrfs/218 | 6 ++---- > tests/btrfs/225 | 4 ++-- > tests/btrfs/238 | 5 ++--- > 5 files changed, 11 insertions(+), 14 deletions(-) > > diff --git a/tests/btrfs/199 b/tests/btrfs/199 > index 709ad1f988c3..a4920b99ef97 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 2ed4866887f7..979dcb73f097 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 672ad0ff61f0..b0434834ff65 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 cfb64a342644..677c162cb63a 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 57245917e16a..3a711ea7a1a8 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 > -- > 2.31.1 >
diff --git a/tests/btrfs/199 b/tests/btrfs/199 index 709ad1f988c3..a4920b99ef97 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 2ed4866887f7..979dcb73f097 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 672ad0ff61f0..b0434834ff65 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 cfb64a342644..677c162cb63a 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 57245917e16a..3a711ea7a1a8 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
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> --- tests/btrfs/199 | 6 +++--- tests/btrfs/216 | 4 ++-- tests/btrfs/218 | 6 ++---- tests/btrfs/225 | 4 ++-- tests/btrfs/238 | 5 ++--- 5 files changed, 11 insertions(+), 14 deletions(-)