From: Darrick J. Wong <djwong@kernel.org>
Date: Wed, 26 Jul 2023 01:57:00 +0000 (-0700)
Subject: xfs/122: adjust test for flexarray conversions in 6.5
X-Git-Tag: v2023.08.06~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=03d27d8025697c987896d91ec0af8a41a5986412;p=xfstests-dev.git

xfs/122: adjust test for flexarray conversions in 6.5

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>
---

diff --git a/tests/xfs/122 b/tests/xfs/122
index e616f198..ba927c77 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
 }