Re: [PATCH 4/4] xfs: Remove typedef xfs_attr_shortform_t

Darrick J. Wong
2020-08-31T15:37:09Z

On Mon, Aug 31, 2020 at 03:04:23PM +0200, Carlos Maiolino wrote:
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>

Looks straightforward,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
> fs/xfs/libxfs/xfs_attr.c | 4 ++--
> fs/xfs/libxfs/xfs_attr_leaf.c | 16 ++++++++--------
> fs/xfs/libxfs/xfs_da_format.h | 4 ++--
> fs/xfs/xfs_attr_list.c | 2 +-
> fs/xfs/xfs_ondisk.h | 12 ++++++------
> 5 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 2b48fdb394e80..0468ead236924 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -525,8 +525,8 @@ xfs_attr_set(
>
> static inline int xfs_attr_sf_totsize(struct xfs_inode *dp) {
>
> - xfs_attr_shortform_t *sf =
> - (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data;
> + struct xfs_attr_shortform *sf =
> + (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data;
>
> return (be16_to_cpu(sf->hdr.totsize));
>
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
> index bcc76ff298646..f64ab351b760c 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.c
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
> @@ -728,14 +728,14 @@ xfs_attr_shortform_add(
>
> ifp = dp->i_afp;
> ASSERT(ifp->if_flags & XFS_IFINLINE);
> - sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;
> + sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;
> if (xfs_attr_sf_findname(args, &sfe, NULL) == -EEXIST)
> ASSERT(0);
>
> offset = (char *)sfe - (char *)sf;
> 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;
> + sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;
> sfe = (struct xfs_attr_sf_entry *)((char *)sf + offset);
>
> sfe->namelen = args->namelen;
> @@ -787,7 +787,7 @@ xfs_attr_shortform_remove(
>
> dp = args->dp;
> mp = dp->i_mount;
> - sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data;
> + sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data;
>
> error = xfs_attr_sf_findname(args, &sfe, &base);
> if (error != -EEXIST)
> @@ -837,7 +837,7 @@ xfs_attr_shortform_remove(
> int
> xfs_attr_shortform_lookup(xfs_da_args_t *args)
> {
> - xfs_attr_shortform_t *sf;
> + struct xfs_attr_shortform *sf;
> struct xfs_attr_sf_entry *sfe;
> int i;
> struct xfs_ifork *ifp;
> @@ -846,7 +846,7 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args)
>
> ifp = args->dp->i_afp;
> ASSERT(ifp->if_flags & XFS_IFINLINE);
> - sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;
> + sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;
> sfe = &sf->list[0];
> for (i = 0; i < sf->hdr.count;
> sfe = xfs_attr_sf_nextentry(sfe), i++) {
> @@ -873,7 +873,7 @@ xfs_attr_shortform_getvalue(
> int i;
>
> ASSERT(args->dp->i_afp->if_flags == XFS_IFINLINE);
> - sf = (xfs_attr_shortform_t *)args->dp->i_afp->if_u1.if_data;
> + sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data;
> sfe = &sf->list[0];
> for (i = 0; i < sf->hdr.count;
> sfe = xfs_attr_sf_nextentry(sfe), i++) {
> @@ -908,12 +908,12 @@ xfs_attr_shortform_to_leaf(
>
> dp = args->dp;
> ifp = dp->i_afp;
> - sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;
> + sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;
> size = be16_to_cpu(sf->hdr.totsize);
> tmpbuffer = kmem_alloc(size, 0);
> ASSERT(tmpbuffer != NULL);
> memcpy(tmpbuffer, ifp->if_u1.if_data, size);
> - sf = (xfs_attr_shortform_t *)tmpbuffer;
> + sf = (struct xfs_attr_shortform *)tmpbuffer;
>
> xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);
> xfs_bmap_local_to_extents_empty(args->trans, dp, XFS_ATTR_FORK);
> diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h
> index e86185a1165b3..b40a4e80f5ee6 100644
> --- a/fs/xfs/libxfs/xfs_da_format.h
> +++ b/fs/xfs/libxfs/xfs_da_format.h
> @@ -579,7 +579,7 @@ xfs_dir2_block_leaf_p(struct xfs_dir2_block_tail *btp)
> /*
> * Entries are packed toward the top as tight as possible.
> */
> -typedef struct xfs_attr_shortform {
> +struct xfs_attr_shortform {
> struct xfs_attr_sf_hdr { /* constant-structure header block */
> __be16 totsize; /* total bytes in shortform list */
> __u8 count; /* count of active entries */
> @@ -591,7 +591,7 @@ typedef struct xfs_attr_shortform {
> uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */
> uint8_t nameval[]; /* name & value bytes concatenated */
> } list[1]; /* variable sized array */
> -} xfs_attr_shortform_t;
> +};
>
> typedef struct xfs_attr_leaf_map { /* RLE map of free bytes */
> __be16 base; /* base of free region */
> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
> index fbe5574f08930..8f8837fe21cf0 100644
> --- a/fs/xfs/xfs_attr_list.c
> +++ b/fs/xfs/xfs_attr_list.c
> @@ -61,7 +61,7 @@ xfs_attr_shortform_list(
> int error = 0;
>
> ASSERT(dp->i_afp != NULL);
> - sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data;
> + sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data;
> ASSERT(sf != NULL);
> if (!sf->hdr.count)
> return 0;
> diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
> index 5f04d8a5ab2a9..ad51c8eb447b1 100644
> --- a/fs/xfs/xfs_ondisk.h
> +++ b/fs/xfs/xfs_ondisk.h
> @@ -84,12 +84,12 @@ xfs_check_ondisk_structs(void)
> XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, namelen, 8);
> XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, name, 9);
> XFS_CHECK_STRUCT_SIZE(xfs_attr_leafblock_t, 40);
> - XFS_CHECK_OFFSET(xfs_attr_shortform_t, hdr.totsize, 0);
> - XFS_CHECK_OFFSET(xfs_attr_shortform_t, hdr.count, 2);
> - XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].namelen, 4);
> - XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].valuelen, 5);
> - XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].flags, 6);
> - XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].nameval, 7);
> + XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.totsize, 0);
> + XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.count, 2);
> + XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].namelen, 4);
> + XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].valuelen, 5);
> + XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].flags, 6);
> + XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].nameval, 7);
> XFS_CHECK_STRUCT_SIZE(xfs_da_blkinfo_t, 12);
> XFS_CHECK_STRUCT_SIZE(xfs_da_intnode_t, 16);
> XFS_CHECK_STRUCT_SIZE(xfs_da_node_entry_t, 8);
> --
> 2.26.2
>