diff mbox series

[1/1] xfs/122: adjust test for flexarray conversions in 6.5

Message ID 169033662042.3222297.14047592154027443561.stgit@frogsfrogsfrogs (mailing list archive)
State New, archived
Headers show
Series fstests: updates for Linux 6.5 | expand

Commit Message

Darrick J. Wong July 26, 2023, 1:57 a.m. UTC 
From: Darrick J. Wong <djwong@kernel.org>

Adjust the output of this test to handle the conversion of flexarray
declaration conversions in 6.5.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/xfs/122 |    8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Zorro Lang July 27, 2023, 1:57 p.m. UTC | #1 
On Tue, Jul 25, 2023 at 06:57:00PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Adjust the output of this test to handle the conversion of flexarray
> declaration conversions in 6.5.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---

Looks like it's about a49bbce58ea9 ("xfs: convert flex-array declarations
in xfs attr leaf blocks"). If you don't mind, I'd like to mention it in commit
log when I merge it :) This patch looks good to me,

Reviewed-by: Zorro Lang <zlang@redhat.com>

Thanks,
Zorro

>  tests/xfs/122 |    8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> 
> diff --git a/tests/xfs/122 b/tests/xfs/122
> index e616f1987d..ba927c77c4 100755
> --- a/tests/xfs/122
> +++ b/tests/xfs/122
> @@ -26,13 +26,21 @@ _wants_kernel_commit 03a7485cd701 \
>  _type_size_filter()
>  {
>  	# lazy SB adds __be32 agf_btreeblks - pv960372
> +	# flexarray conversion of the attr structures in Linux 6.5 changed
> +	# the sizeof output
>  	if [ "$($MKFS_XFS_PROG 2>&1 | grep -c lazy-count )" == "0" ]; then
>  		perl -ne '
>  s/sizeof\( xfs_agf_t \) = 60/sizeof( xfs_agf_t ) = <SIZE>/;
> +s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
> +s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
> +s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
>  		print;'
>  	else
>  		perl -ne '
>  s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = <SIZE>/;
> +s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
> +s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
> +s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
>  		print;'
>  	fi
>  }
>
Darrick J. Wong July 27, 2023, 3:23 p.m. UTC | #2 
On Thu, Jul 27, 2023 at 09:57:44PM +0800, Zorro Lang wrote:
> On Tue, Jul 25, 2023 at 06:57:00PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> > 
> > Adjust the output of this test to handle the conversion of flexarray
> > declaration conversions in 6.5.
> > 
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > ---
> 
> Looks like it's about a49bbce58ea9 ("xfs: convert flex-array declarations
> in xfs attr leaf blocks"). If you don't mind, I'd like to mention it in commit
> log when I merge it :) This patch looks good to me,

Please do mention it.  I wasn't sure if I should do that or a _fixed_by
tag, since technically there's no breakage in the xfs code itself...

--D

> Reviewed-by: Zorro Lang <zlang@redhat.com>
> 
> Thanks,
> Zorro
> 
> >  tests/xfs/122 |    8 ++++++++
> >  1 file changed, 8 insertions(+)
> > 
> > 
> > diff --git a/tests/xfs/122 b/tests/xfs/122
> > index e616f1987d..ba927c77c4 100755
> > --- a/tests/xfs/122
> > +++ b/tests/xfs/122
> > @@ -26,13 +26,21 @@ _wants_kernel_commit 03a7485cd701 \
> >  _type_size_filter()
> >  {
> >  	# lazy SB adds __be32 agf_btreeblks - pv960372
> > +	# flexarray conversion of the attr structures in Linux 6.5 changed
> > +	# the sizeof output
> >  	if [ "$($MKFS_XFS_PROG 2>&1 | grep -c lazy-count )" == "0" ]; then
> >  		perl -ne '
> >  s/sizeof\( xfs_agf_t \) = 60/sizeof( xfs_agf_t ) = <SIZE>/;
> > +s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
> > +s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
> > +s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
> >  		print;'
> >  	else
> >  		perl -ne '
> >  s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = <SIZE>/;
> > +s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
> > +s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
> > +s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
> >  		print;'
> >  	fi
> >  }
> > 
>
Zorro Lang July 27, 2023, 3:34 p.m. UTC | #3 
On Thu, Jul 27, 2023 at 08:23:36AM -0700, Darrick J. Wong wrote:
> On Thu, Jul 27, 2023 at 09:57:44PM +0800, Zorro Lang wrote:
> > On Tue, Jul 25, 2023 at 06:57:00PM -0700, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <djwong@kernel.org>
> > > 
> > > Adjust the output of this test to handle the conversion of flexarray
> > > declaration conversions in 6.5.
> > > 
> > > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > > ---
> > 
> > Looks like it's about a49bbce58ea9 ("xfs: convert flex-array declarations
> > in xfs attr leaf blocks"). If you don't mind, I'd like to mention it in commit
> > log when I merge it :) This patch looks good to me,
> 
> Please do mention it.  I wasn't sure if I should do that or a _fixed_by
> tag, since technically there's no breakage in the xfs code itself...

Thanks, a _fixed_by tag looks not suitable, I also don't want to add _fixed_by
each time we change this case. So I don't have better idea, have to mention
the kernel commit in this commit log, to leave a record at least.

> 
> --D
> 
> > Reviewed-by: Zorro Lang <zlang@redhat.com>
> > 
> > Thanks,
> > Zorro
> > 
> > >  tests/xfs/122 |    8 ++++++++
> > >  1 file changed, 8 insertions(+)
> > > 
> > > 
> > > diff --git a/tests/xfs/122 b/tests/xfs/122
> > > index e616f1987d..ba927c77c4 100755
> > > --- a/tests/xfs/122
> > > +++ b/tests/xfs/122
> > > @@ -26,13 +26,21 @@ _wants_kernel_commit 03a7485cd701 \
> > >  _type_size_filter()
> > >  {
> > >  	# lazy SB adds __be32 agf_btreeblks - pv960372
> > > +	# flexarray conversion of the attr structures in Linux 6.5 changed
> > > +	# the sizeof output
> > >  	if [ "$($MKFS_XFS_PROG 2>&1 | grep -c lazy-count )" == "0" ]; then
> > >  		perl -ne '
> > >  s/sizeof\( xfs_agf_t \) = 60/sizeof( xfs_agf_t ) = <SIZE>/;
> > > +s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
> > > +s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
> > > +s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
> > >  		print;'
> > >  	else
> > >  		perl -ne '
> > >  s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = <SIZE>/;
> > > +s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
> > > +s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
> > > +s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
> > >  		print;'
> > >  	fi
> > >  }
> > > 
> > 
>
diff mbox series

Patch

diff --git a/tests/xfs/122 b/tests/xfs/122
index e616f1987d..ba927c77c4 100755
--- a/tests/xfs/122
+++ b/tests/xfs/122
@@ -26,13 +26,21 @@  _wants_kernel_commit 03a7485cd701 \
 _type_size_filter()
 {
 	# lazy SB adds __be32 agf_btreeblks - pv960372
+	# flexarray conversion of the attr structures in Linux 6.5 changed
+	# the sizeof output
 	if [ "$($MKFS_XFS_PROG 2>&1 | grep -c lazy-count )" == "0" ]; then
 		perl -ne '
 s/sizeof\( xfs_agf_t \) = 60/sizeof( xfs_agf_t ) = <SIZE>/;
+s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
+s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
+s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
 		print;'
 	else
 		perl -ne '
 s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = <SIZE>/;
+s/sizeof\(struct xfs_attr3_leafblock\) = 80/sizeof(struct xfs_attr3_leafblock) = 88/;
+s/sizeof\(struct xfs_attr_shortform\) = 4/sizeof(struct xfs_attr_shortform) = 8/;
+s/sizeof\(xfs_attr_leafblock_t\) = 32/sizeof(xfs_attr_leafblock_t) = 40/;
 		print;'
 	fi
 }