On Wed, Sep 02, 2020 at 04:40:56PM +0200, Carlos Maiolino wrote:
> Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
>
> Changelog:
> V2:
> - Reordered within the series, no functional changes
>
> fs/xfs/libxfs/xfs_attr_leaf.c | 4 ++--
> fs/xfs/libxfs/xfs_attr_sf.h | 11 ++++++-----
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
> index 305d4bc073370..76d3814f9dc79 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.c
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
> @@ -736,7 +736,7 @@ xfs_attr_shortform_add(
> size = XFS_ATTR_SF_ENTSIZE_BYNAME(args->namelen, args->valuelen);
> xfs_idata_realloc(dp, size, XFS_ATTR_FORK);
> sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;
> - sfe = (xfs_attr_sf_entry_t *)((char *)sf + offset);
> + sfe = (struct xfs_attr_sf_entry *)((char *)sf + offset);
>
> sfe->namelen = args->namelen;
> sfe->valuelen = args->valuelen;
> @@ -838,7 +838,7 @@ int
> xfs_attr_shortform_lookup(xfs_da_args_t *args)
> {
> xfs_attr_shortform_t *sf;
> - xfs_attr_sf_entry_t *sfe;
> + struct xfs_attr_sf_entry *sfe;
> int i;
> struct xfs_ifork *ifp;
>
> diff --git a/fs/xfs/libxfs/xfs_attr_sf.h b/fs/xfs/libxfs/xfs_attr_sf.h
> index bb004fb7944a7..c4afb33079184 100644
> --- a/fs/xfs/libxfs/xfs_attr_sf.h
> +++ b/fs/xfs/libxfs/xfs_attr_sf.h
> @@ -13,7 +13,6 @@
> * to fit into the literal area of the inode.
> */
> typedef struct xfs_attr_sf_hdr xfs_attr_sf_hdr_t;
> -typedef struct xfs_attr_sf_entry xfs_attr_sf_entry_t;
>
> /*
> * We generate this then sort it, attr_list() must return things in hash-order.
> @@ -28,15 +27,17 @@ typedef struct xfs_attr_sf_sort {
> } xfs_attr_sf_sort_t;
>
> #define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen) /* space name/value uses */ \
> - (((int)sizeof(xfs_attr_sf_entry_t)-1 + (nlen)+(vlen)))
> + (((int)sizeof(struct xfs_attr_sf_entry)-1 + (nlen)+(vlen)))
> #define XFS_ATTR_SF_ENTSIZE_MAX /* max space for name&value */ \
> ((1 << (NBBY*(int)sizeof(uint8_t))) - 1)
> #define XFS_ATTR_SF_ENTSIZE(sfep) /* space an entry uses */ \
> - ((int)sizeof(xfs_attr_sf_entry_t)-1 + (sfep)->namelen+(sfep)->valuelen)
> + ((int)sizeof(struct xfs_attr_sf_entry)-1 + \
> + (sfep)->namelen+(sfep)->valuelen)
> #define XFS_ATTR_SF_NEXTENTRY(sfep) /* next entry in struct */ \
> - ((xfs_attr_sf_entry_t *)((char *)(sfep) + XFS_ATTR_SF_ENTSIZE(sfep)))
> + ((struct xfs_attr_sf_entry *)((char *)(sfep) + \
> + XFS_ATTR_SF_ENTSIZE(sfep)))
> #define XFS_ATTR_SF_TOTSIZE(dp) /* total space in use */ \
> - (be16_to_cpu(((xfs_attr_shortform_t *) \
> + (be16_to_cpu(((struct xfs_attr_shortform *) \
> ((dp)->i_afp->if_u1.if_data))->hdr.totsize))
>
> #endif /* __XFS_ATTR_SF_H__ */
> --
> 2.26.2
>
