| Message ID | b0375c439b0f4d4da5de569d19bcb53bc2a0c66a.1676446803.git.anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] fstests: btrfs/185, 198 and 219 add _fixed_by_kernel_commit | expand |
On Wed, Feb 15, 2023 at 03:51:22PM +0800, Anand Jain wrote: > Recently, these test cases were added to the auto group. To ensure we have > some clues if they fail in older kernels, add "_fixed_by_kernel_commit" > for the fix and update the test summary. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> > --- Looks good to me, Reviewed-by: Zorro Lang <zlang@redhat.com> > v3: Combine these patches together. > fstests: btrfs/198, add _fixed_by_kernel_commit > fstests: btrfs/219, add _fixed_by_kernel_commit > fstests: btrfs/185, add _fixed_by_kernel_commit > > v2: btrfs/219: _fixed_by_kernel_commit: Substitute the placeholder with > the commit id. > > tests/btrfs/185 | 2 ++ > tests/btrfs/198 | 6 +++--- > tests/btrfs/219 | 9 ++++----- > 3 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/tests/btrfs/185 b/tests/btrfs/185 > index efb10ac72b79..ba0200617e69 100755 > --- a/tests/btrfs/185 > +++ b/tests/btrfs/185 > @@ -27,6 +27,8 @@ _cleanup() > _supported_fs btrfs > _require_scratch_dev_pool 2 > _scratch_dev_pool_get 2 > +_fixed_by_kernel_commit a9261d4125c9 \ > + "btrfs: harden agaist duplicate fsid on scanned devices" > > device_1=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $1}') > device_2=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}') > diff --git a/tests/btrfs/198 b/tests/btrfs/198 > index 2b68754ade52..7d23ffcee3c5 100755 > --- a/tests/btrfs/198 > +++ b/tests/btrfs/198 > @@ -4,9 +4,7 @@ > # > # FS QA Test 198 > # > -# Test stale and alien non-btrfs device in the fs devices list. > -# Bug fixed in: > -# btrfs: remove identified alien device in open_fs_devices > +# Test outdated and foreign non-btrfs devices in the device listing. > # > . ./common/preamble > _begin_fstest auto quick volume > @@ -22,6 +20,8 @@ _require_scratch > _require_scratch_dev_pool 4 > # Zoned btrfs only supports SINGLE profile > _require_non_zoned_device ${SCRATCH_DEV} > +_fixed_by_kernel_commit 96c2e067ed3e3e \ > + "btrfs: skip devices without magic signature when mounting" > > workout() > { > diff --git a/tests/btrfs/219 b/tests/btrfs/219 > index d69e6ac918ae..b747ce34fcc4 100755 > --- a/tests/btrfs/219 > +++ b/tests/btrfs/219 > @@ -6,11 +6,8 @@ > # > # Test a variety of stale device usecases. We cache the device and generation > # to make sure we do not allow stale devices, which can end up with some wonky > -# behavior for loop back devices. This was changed with > -# > -# btrfs: allow single disk devices to mount with older generations > -# > -# But I've added a few other test cases so it's clear what we expect to happen > +# behavior for loop back devices. > +# And, added a few other test cases so it's clear what we expect to happen > # currently. > # > > @@ -42,6 +39,8 @@ _supported_fs btrfs > _require_test > _require_loop > _require_btrfs_forget_or_module_loadable > +_fixed_by_kernel_commit 5f58d783fd78 \ > + "btrfs: free device in btrfs_close_devices for a single device filesystem" > > loop_mnt=$TEST_DIR/$seq.mnt > loop_mnt1=$TEST_DIR/$seq.mnt1 > -- > 2.38.1 >
diff --git a/tests/btrfs/185 b/tests/btrfs/185 index efb10ac72b79..ba0200617e69 100755 --- a/tests/btrfs/185 +++ b/tests/btrfs/185 @@ -27,6 +27,8 @@ _cleanup() _supported_fs btrfs _require_scratch_dev_pool 2 _scratch_dev_pool_get 2 +_fixed_by_kernel_commit a9261d4125c9 \ + "btrfs: harden agaist duplicate fsid on scanned devices" device_1=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $1}') device_2=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}') diff --git a/tests/btrfs/198 b/tests/btrfs/198 index 2b68754ade52..7d23ffcee3c5 100755 --- a/tests/btrfs/198 +++ b/tests/btrfs/198 @@ -4,9 +4,7 @@ # # FS QA Test 198 # -# Test stale and alien non-btrfs device in the fs devices list. -# Bug fixed in: -# btrfs: remove identified alien device in open_fs_devices +# Test outdated and foreign non-btrfs devices in the device listing. # . ./common/preamble _begin_fstest auto quick volume @@ -22,6 +20,8 @@ _require_scratch _require_scratch_dev_pool 4 # Zoned btrfs only supports SINGLE profile _require_non_zoned_device ${SCRATCH_DEV} +_fixed_by_kernel_commit 96c2e067ed3e3e \ + "btrfs: skip devices without magic signature when mounting" workout() { diff --git a/tests/btrfs/219 b/tests/btrfs/219 index d69e6ac918ae..b747ce34fcc4 100755 --- a/tests/btrfs/219 +++ b/tests/btrfs/219 @@ -6,11 +6,8 @@ # # Test a variety of stale device usecases. We cache the device and generation # to make sure we do not allow stale devices, which can end up with some wonky -# behavior for loop back devices. This was changed with -# -# btrfs: allow single disk devices to mount with older generations -# -# But I've added a few other test cases so it's clear what we expect to happen +# behavior for loop back devices. +# And, added a few other test cases so it's clear what we expect to happen # currently. # @@ -42,6 +39,8 @@ _supported_fs btrfs _require_test _require_loop _require_btrfs_forget_or_module_loadable +_fixed_by_kernel_commit 5f58d783fd78 \ + "btrfs: free device in btrfs_close_devices for a single device filesystem" loop_mnt=$TEST_DIR/$seq.mnt loop_mnt1=$TEST_DIR/$seq.mnt1
Recently, these test cases were added to the auto group. To ensure we have some clues if they fail in older kernels, add "_fixed_by_kernel_commit" for the fix and update the test summary. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- v3: Combine these patches together. fstests: btrfs/198, add _fixed_by_kernel_commit fstests: btrfs/219, add _fixed_by_kernel_commit fstests: btrfs/185, add _fixed_by_kernel_commit v2: btrfs/219: _fixed_by_kernel_commit: Substitute the placeholder with the commit id. tests/btrfs/185 | 2 ++ tests/btrfs/198 | 6 +++--- tests/btrfs/219 | 9 ++++----- 3 files changed, 9 insertions(+), 8 deletions(-)