diff mbox series

[5/5] xfs/49[12]: skip pre-lazysbcount filesystems

Message ID 161958296475.3452351.7075798777673076839.stgit@magnolia (mailing list archive)
State Accepted
Headers show
Series fstests: miscellaneous fixes | expand

Commit Message

Darrick J. Wong April 28, 2021, 4:09 a.m. UTC 
From: Darrick J. Wong <djwong@kernel.org>

Prior to lazysbcount, the xfs mount code blindly trusted the value of
the fdblocks counter in the primary super, which means that the kernel
doesn't detect the fuzzed fdblocks value at all.  V4 is deprecated and
pre-lazysbcount V4 hasn't been the default for ~14 years, so we'll just
skip these two tests on those old filesystems.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/xfs/491 |    5 +++++
 tests/xfs/492 |    5 +++++
 2 files changed, 10 insertions(+)

Comments

Brian Foster April 28, 2021, 5:47 p.m. UTC | #1 
On Tue, Apr 27, 2021 at 09:09:24PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Prior to lazysbcount, the xfs mount code blindly trusted the value of
> the fdblocks counter in the primary super, which means that the kernel
> doesn't detect the fuzzed fdblocks value at all.  V4 is deprecated and
> pre-lazysbcount V4 hasn't been the default for ~14 years, so we'll just
> skip these two tests on those old filesystems.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
>  tests/xfs/491 |    5 +++++
>  tests/xfs/492 |    5 +++++
>  2 files changed, 10 insertions(+)
> 
> 
> diff --git a/tests/xfs/491 b/tests/xfs/491
> index 6420202b..9fd0ab56 100755
> --- a/tests/xfs/491
> +++ b/tests/xfs/491
> @@ -36,6 +36,11 @@ _require_scratch
>  
>  echo "Format and mount"
>  _scratch_mkfs > $seqres.full 2>&1
> +
> +# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
> +_check_scratch_xfs_features LAZYSBCOUNT &>/dev/null || \
> +	_notrun "filesystem requires lazysbcount"
> +

Perhaps we should turn this one into a '_require_scratch_xfs_feature
<FEATURE>' helper or some such? Probably not that important for
lazysbcount filtering, but it seems like that might be useful for newer
features going forward.

Brian

>  _scratch_mount >> $seqres.full 2>&1
>  echo "test file" > $SCRATCH_MNT/testfile
>  
> diff --git a/tests/xfs/492 b/tests/xfs/492
> index 522def47..c4b087b5 100755
> --- a/tests/xfs/492
> +++ b/tests/xfs/492
> @@ -36,6 +36,11 @@ _require_scratch
>  
>  echo "Format and mount"
>  _scratch_mkfs > $seqres.full 2>&1
> +
> +# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
> +_check_scratch_xfs_features LAZYSBCOUNT &>/dev/null || \
> +	_notrun "filesystem requires lazysbcount"
> +
>  _scratch_mount >> $seqres.full 2>&1
>  echo "test file" > $SCRATCH_MNT/testfile
>  
>
Darrick J. Wong April 29, 2021, 12:44 a.m. UTC | #2 
On Wed, Apr 28, 2021 at 01:47:53PM -0400, Brian Foster wrote:
> On Tue, Apr 27, 2021 at 09:09:24PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> > 
> > Prior to lazysbcount, the xfs mount code blindly trusted the value of
> > the fdblocks counter in the primary super, which means that the kernel
> > doesn't detect the fuzzed fdblocks value at all.  V4 is deprecated and
> > pre-lazysbcount V4 hasn't been the default for ~14 years, so we'll just
> > skip these two tests on those old filesystems.
> > 
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > ---
> >  tests/xfs/491 |    5 +++++
> >  tests/xfs/492 |    5 +++++
> >  2 files changed, 10 insertions(+)
> > 
> > 
> > diff --git a/tests/xfs/491 b/tests/xfs/491
> > index 6420202b..9fd0ab56 100755
> > --- a/tests/xfs/491
> > +++ b/tests/xfs/491
> > @@ -36,6 +36,11 @@ _require_scratch
> >  
> >  echo "Format and mount"
> >  _scratch_mkfs > $seqres.full 2>&1
> > +
> > +# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
> > +_check_scratch_xfs_features LAZYSBCOUNT &>/dev/null || \
> > +	_notrun "filesystem requires lazysbcount"
> > +
> 
> Perhaps we should turn this one into a '_require_scratch_xfs_feature
> <FEATURE>' helper or some such? Probably not that important for
> lazysbcount filtering, but it seems like that might be useful for newer
> features going forward.

Good idea, there are a few more tests in my stack that will need this.

--D

> Brian
> 
> >  _scratch_mount >> $seqres.full 2>&1
> >  echo "test file" > $SCRATCH_MNT/testfile
> >  
> > diff --git a/tests/xfs/492 b/tests/xfs/492
> > index 522def47..c4b087b5 100755
> > --- a/tests/xfs/492
> > +++ b/tests/xfs/492
> > @@ -36,6 +36,11 @@ _require_scratch
> >  
> >  echo "Format and mount"
> >  _scratch_mkfs > $seqres.full 2>&1
> > +
> > +# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
> > +_check_scratch_xfs_features LAZYSBCOUNT &>/dev/null || \
> > +	_notrun "filesystem requires lazysbcount"
> > +
> >  _scratch_mount >> $seqres.full 2>&1
> >  echo "test file" > $SCRATCH_MNT/testfile
> >  
> > 
>
diff mbox series

Patch

diff --git a/tests/xfs/491 b/tests/xfs/491
index 6420202b..9fd0ab56 100755
--- a/tests/xfs/491
+++ b/tests/xfs/491
@@ -36,6 +36,11 @@  _require_scratch
 
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
+
+# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
+_check_scratch_xfs_features LAZYSBCOUNT &>/dev/null || \
+	_notrun "filesystem requires lazysbcount"
+
 _scratch_mount >> $seqres.full 2>&1
 echo "test file" > $SCRATCH_MNT/testfile
 
diff --git a/tests/xfs/492 b/tests/xfs/492
index 522def47..c4b087b5 100755
--- a/tests/xfs/492
+++ b/tests/xfs/492
@@ -36,6 +36,11 @@  _require_scratch
 
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
+
+# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
+_check_scratch_xfs_features LAZYSBCOUNT &>/dev/null || \
+	_notrun "filesystem requires lazysbcount"
+
 _scratch_mount >> $seqres.full 2>&1
 echo "test file" > $SCRATCH_MNT/testfile