]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
xfs/122: adjust test for flexarray conversions in 6.5
authorDarrick J. Wong <djwong@kernel.org>
Wed, 26 Jul 2023 01:57:00 +0000 (18:57 -0700)
committerZorro Lang <zlang@kernel.org>
Fri, 4 Aug 2023 16:06:25 +0000 (00:06 +0800)
Adjust the output of this test to handle the conversion of flexarray
declaration conversions in linux v6.5, commit a49bbce58ea9 ("xfs:
convert flex-array declarations in xfs attr leaf blocks")

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
tests/xfs/122

index e616f1987dfb4d8e5065ad5deaa0770f47bfa929..ba927c77c46a41016a97bdc7dde2df4dc88ebed6 100755 (executable)
@@ -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
 }