On Tue, Apr 30, 2024 at 02:46:18PM +0200, Andrey Albershteyn wrote: > On 2024-04-29 20:41:19, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@xxxxxxxxxx> > > > > Adjust these tests to accomdate the use of xattrs to store fsverity > > metadata. > > > > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> > > --- > > tests/xfs/021 | 3 +++ > > tests/xfs/122.out | 1 + > > 2 files changed, 4 insertions(+) > > > > > > diff --git a/tests/xfs/021 b/tests/xfs/021 > > index ef307fc064..dcecf41958 100755 > > --- a/tests/xfs/021 > > +++ b/tests/xfs/021 > > @@ -118,6 +118,7 @@ _scratch_xfs_db -r -c "inode $inum_1" -c "print a.sfattr" | \ > > perl -ne ' > > /\.secure/ && next; > > /\.parent/ && next; > > +/\.verity/ && next; > > print unless /^\d+:\[.*/;' > > > > echo "*** dump attributes (2)" > > @@ -128,6 +129,7 @@ _scratch_xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print \ > > | perl -ne ' > > s/,secure//; > > s/,parent//; > > +s/,verity//; > > s/info.hdr/info/; > > /hdr.info.crc/ && next; > > /hdr.info.bno/ && next; > > @@ -135,6 +137,7 @@ s/info.hdr/info/; > > /hdr.info.lsn/ && next; > > /hdr.info.owner/ && next; > > /\.parent/ && next; > > +/\.verity/ && next; > > s/^(hdr.info.magic =) 0x3bee/\1 0xfbee/; > > s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/; > > s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/; > > diff --git a/tests/xfs/122.out b/tests/xfs/122.out > > index abd82e7142..019fe7545f 100644 > > --- a/tests/xfs/122.out > > +++ b/tests/xfs/122.out > > @@ -142,6 +142,7 @@ sizeof(struct xfs_scrub_vec) = 16 > > sizeof(struct xfs_scrub_vec_head) = 40 > > sizeof(struct xfs_swap_extent) = 64 > > sizeof(struct xfs_unmount_log_format) = 8 > > +sizeof(struct xfs_verity_merkle_key) = 8 Whoops, this change isn't needed anymore. --D > > sizeof(struct xfs_xmd_log_format) = 16 > > sizeof(struct xfs_xmi_log_format) = 88 > > sizeof(union xfs_rtword_raw) = 4 > > > > Looks good to me: > Reviewed-by: Andrey Albershteyn <aalbersh@xxxxxxxxxx> > > -- > - Andrey > >
