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@xxxxxxxxxx>
> >
> > Adjust the output of this test to handle the conversion of flexarray
> > declaration conversions in 6.5.
> >
> > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> > ---
>
> 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@xxxxxxxxxx>
>
> 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
> > }
> >
>
