Re: [PATCH 36/46] xfs: remove the now unused ->data_entry_p method

Darrick J. Wong
2019-11-08T01:02:18Z

On Thu, Nov 07, 2019 at 07:24:00PM +0100, Christoph Hellwig wrote:
> Now that all users use the data_entry_offset field this method is
> unused and can be removed.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

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

--D

> ---
> fs/xfs/libxfs/xfs_da_format.c | 20 --------------------
> fs/xfs/libxfs/xfs_dir2.h | 3 ---
> 2 files changed, 23 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
> index 347092ec28ab..e70cc54d99e1 100644
> --- a/fs/xfs/libxfs/xfs_da_format.c
> +++ b/fs/xfs/libxfs/xfs_da_format.c
> @@ -123,20 +123,6 @@ xfs_dir3_data_bestfree_p(struct xfs_dir2_data_hdr *hdr)
> return ((struct xfs_dir3_data_hdr *)hdr)->best_free;
> }
>
> -static struct xfs_dir2_data_entry *
> -xfs_dir2_data_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_dir3_data_entry_p(struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_entry *)
> - ((char *)hdr + sizeof(struct xfs_dir3_data_hdr));
> -}
> -
> static const struct xfs_dir_ops xfs_dir2_ops = {
> .data_entsize = xfs_dir2_data_entsize,
> .data_get_ftype = xfs_dir2_data_get_ftype,
> @@ -148,8 +134,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
> XFS_DIR2_DATA_ENTSIZE(1) +
> XFS_DIR2_DATA_ENTSIZE(2),
> .data_entry_offset = sizeof(struct xfs_dir2_data_hdr),
> -
> - .data_entry_p = xfs_dir2_data_entry_p,
> };
>
> static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
> @@ -163,8 +147,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
> XFS_DIR3_DATA_ENTSIZE(1) +
> XFS_DIR3_DATA_ENTSIZE(2),
> .data_entry_offset = sizeof(struct xfs_dir2_data_hdr),
> -
> - .data_entry_p = xfs_dir2_data_entry_p,
> };
>
> static const struct xfs_dir_ops xfs_dir3_ops = {
> @@ -178,8 +160,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
> XFS_DIR3_DATA_ENTSIZE(1) +
> XFS_DIR3_DATA_ENTSIZE(2),
> .data_entry_offset = sizeof(struct xfs_dir3_data_hdr),
> -
> - .data_entry_p = xfs_dir3_data_entry_p,
> };
>
> /*
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index 75aec05aae10..a160f2d4ff37 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -42,9 +42,6 @@ struct xfs_dir_ops {
>
> xfs_dir2_data_aoff_t data_first_offset;
> size_t data_entry_offset;
> -
> - struct xfs_dir2_data_entry *
> - (*data_entry_p)(struct xfs_dir2_data_hdr *hdr);
> };
>
> extern const struct xfs_dir_ops *
> --
> 2.20.1
>