Message ID | 171444688024.962488.13214660928692324111.stgit@frogsfrogsfrogs (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/6] common/verity: enable fsverity for XFS | expand |
On 2024-04-29 20:41:34, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Add fields for fsverity ondisk structures. > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > tests/xfs/122.out | 2 ++ > 1 file changed, 2 insertions(+) > > > diff --git a/tests/xfs/122.out b/tests/xfs/122.out > index 019fe7545f..22f36c0311 100644 > --- a/tests/xfs/122.out > +++ b/tests/xfs/122.out > @@ -65,6 +65,7 @@ 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_attr3_rmtverity_hdr) = 36 > sizeof(struct xfs_attr_sf_entry) = 3 > sizeof(struct xfs_attr_sf_hdr) = 4 > sizeof(struct xfs_attr_shortform) = 8 > @@ -120,6 +121,7 @@ sizeof(struct xfs_log_dinode) = 176 > sizeof(struct xfs_log_legacy_timestamp) = 8 > sizeof(struct xfs_map_extent) = 32 > sizeof(struct xfs_map_freesp) = 32 > +sizeof(struct xfs_merkle_key) = 8 > sizeof(struct xfs_parent_rec) = 12 > sizeof(struct xfs_phys_extent) = 16 > sizeof(struct xfs_refcount_key) = 4 > > Shouldn't this patch be squashed with previous one?
On Tue, Apr 30, 2024 at 02:45:29PM +0200, Andrey Albershteyn wrote: > On 2024-04-29 20:41:34, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@kernel.org> > > > > Add fields for fsverity ondisk structures. > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > --- > > tests/xfs/122.out | 2 ++ > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/tests/xfs/122.out b/tests/xfs/122.out > > index 019fe7545f..22f36c0311 100644 > > --- a/tests/xfs/122.out > > +++ b/tests/xfs/122.out > > @@ -65,6 +65,7 @@ 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_attr3_rmtverity_hdr) = 36 > > sizeof(struct xfs_attr_sf_entry) = 3 > > sizeof(struct xfs_attr_sf_hdr) = 4 > > sizeof(struct xfs_attr_shortform) = 8 > > @@ -120,6 +121,7 @@ sizeof(struct xfs_log_dinode) = 176 > > sizeof(struct xfs_log_legacy_timestamp) = 8 > > sizeof(struct xfs_map_extent) = 32 > > sizeof(struct xfs_map_freesp) = 32 > > +sizeof(struct xfs_merkle_key) = 8 > > sizeof(struct xfs_parent_rec) = 12 > > sizeof(struct xfs_phys_extent) = 16 > > sizeof(struct xfs_refcount_key) = 4 > > > > > > Shouldn't this patch be squashed with previous one? Actualy, the 122.out change in the previous patch is now wrong and can go away. These two changes are still relevant though. --D > -- > - Andrey > >
diff --git a/tests/xfs/122.out b/tests/xfs/122.out index 019fe7545f..22f36c0311 100644 --- a/tests/xfs/122.out +++ b/tests/xfs/122.out @@ -65,6 +65,7 @@ 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_attr3_rmtverity_hdr) = 36 sizeof(struct xfs_attr_sf_entry) = 3 sizeof(struct xfs_attr_sf_hdr) = 4 sizeof(struct xfs_attr_shortform) = 8 @@ -120,6 +121,7 @@ sizeof(struct xfs_log_dinode) = 176 sizeof(struct xfs_log_legacy_timestamp) = 8 sizeof(struct xfs_map_extent) = 32 sizeof(struct xfs_map_freesp) = 32 +sizeof(struct xfs_merkle_key) = 8 sizeof(struct xfs_parent_rec) = 12 sizeof(struct xfs_phys_extent) = 16 sizeof(struct xfs_refcount_key) = 4