From: Darrick J. Wong <djwong@kernel.org>
Date: Wed, 7 Feb 2024 02:19:30 +0000 (-0800)
Subject: xfs/122: fix for xfs_attr_shortform removal in 6.8
X-Git-Tag: v2024.02.09^0
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=386c7b6aa69ebe8017a4728a994f80d55c660de4;p=xfstests-dev.git

xfs/122: fix for xfs_attr_shortform removal in 6.8

The xfs_attr_shortform struct (with multiple flexarrays) was removed in
6.8.  Check the two surviving structures (the attr sf header and entry)
instead.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Andrey Albershteyn <aalbersh@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/xfs/122.out b/tests/xfs/122.out
index 89f7b735..067a0ec7 100644
--- a/tests/xfs/122.out
+++ b/tests/xfs/122.out
@@ -62,6 +62,8 @@ sizeof(struct xfs_agfl) = 36
 sizeof(struct xfs_attr3_leaf_hdr) = 80
 sizeof(struct xfs_attr3_leafblock) = 88
 sizeof(struct xfs_attr3_rmt_hdr) = 56
+sizeof(struct xfs_attr_sf_entry) = 3
+sizeof(struct xfs_attr_sf_hdr) = 4
 sizeof(struct xfs_attr_shortform) = 8
 sizeof(struct xfs_attrd_log_format) = 16
 sizeof(struct xfs_attri_log_format) = 40