On Fri, Nov 01, 2019 at 03:07:08PM -0700, Christoph Hellwig wrote:
> Replace the only user of the ->data_dot_entry_p and ->data_dotdot_entry_p
> dir ops methods with direct calculations using ->data_dot_offset and
> ->data_dotdot_offset.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_da_format.c | 52 ----------------------------------
> fs/xfs/libxfs/xfs_dir2.h | 4 ---
> fs/xfs/libxfs/xfs_dir2_block.c | 4 +--
> 3 files changed, 2 insertions(+), 58 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
> index 1c72b46344d6..84f8355072b4 100644
> --- a/fs/xfs/libxfs/xfs_da_format.c
> +++ b/fs/xfs/libxfs/xfs_da_format.c
> @@ -111,26 +111,6 @@ xfs_dir3_data_entry_tag_p(
> xfs_dir3_data_entsize(dep->namelen) - sizeof(__be16));
> }
>
> -/*
> - * location of . and .. in data space (always block 0)
> - */
> -static struct xfs_dir2_data_entry *
> -xfs_dir2_data_dot_entry_p(
> - struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_entry *)
> - ((char *)hdr + sizeof(struct xfs_dir2_data_hdr));
> -}
> -
> -static struct xfs_dir2_data_entry *
> -xfs_dir2_data_dotdot_entry_p(
> - struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_entry *)
> - ((char *)hdr + sizeof(struct xfs_dir2_data_hdr) +
> - XFS_DIR2_DATA_ENTSIZE(1));
> -}
> -
> static struct xfs_dir2_data_entry *
> xfs_dir2_data_first_entry_p(
> struct xfs_dir2_data_hdr *hdr)
> @@ -141,15 +121,6 @@ xfs_dir2_data_first_entry_p(
> XFS_DIR2_DATA_ENTSIZE(2));
> }
>
> -static struct xfs_dir2_data_entry *
> -xfs_dir2_ftype_data_dotdot_entry_p(
> - struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_entry *)
> - ((char *)hdr + sizeof(struct xfs_dir2_data_hdr) +
> - XFS_DIR3_DATA_ENTSIZE(1));
> -}
> -
> static struct xfs_dir2_data_entry *
> xfs_dir2_ftype_data_first_entry_p(
> struct xfs_dir2_data_hdr *hdr)
> @@ -160,23 +131,6 @@ xfs_dir2_ftype_data_first_entry_p(
> XFS_DIR3_DATA_ENTSIZE(2));
> }
>
> -static struct xfs_dir2_data_entry *
> -xfs_dir3_data_dot_entry_p(
> - struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_entry *)
> - ((char *)hdr + sizeof(struct xfs_dir3_data_hdr));
> -}
> -
> -static struct xfs_dir2_data_entry *
> -xfs_dir3_data_dotdot_entry_p(
> - struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_entry *)
> - ((char *)hdr + sizeof(struct xfs_dir3_data_hdr) +
> - XFS_DIR3_DATA_ENTSIZE(1));
> -}
> -
> static struct xfs_dir2_data_entry *
> xfs_dir3_data_first_entry_p(
> struct xfs_dir2_data_hdr *hdr)
> @@ -242,8 +196,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
> XFS_DIR2_DATA_ENTSIZE(2),
> .data_entry_offset = sizeof(struct xfs_dir2_data_hdr),
>
> - .data_dot_entry_p = xfs_dir2_data_dot_entry_p,
> - .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p,
> .data_first_entry_p = xfs_dir2_data_first_entry_p,
> .data_entry_p = xfs_dir2_data_entry_p,
> .data_unused_p = xfs_dir2_data_unused_p,
> @@ -264,8 +216,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
> XFS_DIR3_DATA_ENTSIZE(2),
> .data_entry_offset = sizeof(struct xfs_dir2_data_hdr),
>
> - .data_dot_entry_p = xfs_dir2_data_dot_entry_p,
> - .data_dotdot_entry_p = xfs_dir2_ftype_data_dotdot_entry_p,
> .data_first_entry_p = xfs_dir2_ftype_data_first_entry_p,
> .data_entry_p = xfs_dir2_data_entry_p,
> .data_unused_p = xfs_dir2_data_unused_p,
> @@ -286,8 +236,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
> XFS_DIR3_DATA_ENTSIZE(2),
> .data_entry_offset = sizeof(struct xfs_dir3_data_hdr),
>
> - .data_dot_entry_p = xfs_dir3_data_dot_entry_p,
> - .data_dotdot_entry_p = xfs_dir3_data_dotdot_entry_p,
> .data_first_entry_p = xfs_dir3_data_first_entry_p,
> .data_entry_p = xfs_dir3_data_entry_p,
> .data_unused_p = xfs_dir3_data_unused_p,
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index 61cc9ae837d5..0198887a1c54 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -45,10 +45,6 @@ struct xfs_dir_ops {
> xfs_dir2_data_aoff_t data_first_offset;
> size_t data_entry_offset;
>
> - struct xfs_dir2_data_entry *
> - (*data_dot_entry_p)(struct xfs_dir2_data_hdr *hdr);
> - struct xfs_dir2_data_entry *
> - (*data_dotdot_entry_p)(struct xfs_dir2_data_hdr *hdr);
> struct xfs_dir2_data_entry *
> (*data_first_entry_p)(struct xfs_dir2_data_hdr *hdr);
> struct xfs_dir2_data_entry *
> diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
> index 5877272dc63e..34e0cdf03950 100644
> --- a/fs/xfs/libxfs/xfs_dir2_block.c
> +++ b/fs/xfs/libxfs/xfs_dir2_block.c
> @@ -1148,7 +1148,7 @@ xfs_dir2_sf_to_block(
> /*
> * Create entry for .
> */
> - dep = dp->d_ops->data_dot_entry_p(hdr);
> + dep = (void *)hdr + dp->d_ops->data_dot_offset;
Same complaint about (void *) arithmetic as last time.
Also, why not leave a static inline helper function or two to
encapsulate the pointer arithmetic and ensure type checking?
--D
> dep->inumber = cpu_to_be64(dp->i_ino);
> dep->namelen = 1;
> dep->name[0] = '.';
> @@ -1162,7 +1162,7 @@ xfs_dir2_sf_to_block(
> /*
> * Create entry for ..
> */
> - dep = dp->d_ops->data_dotdot_entry_p(hdr);
> + dep = (void *)hdr + dp->d_ops->data_dotdot_offset;
> dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));
> dep->namelen = 2;
> dep->name[0] = dep->name[1] = '.';
> --
> 2.20.1
>
