From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 23/34] xfs: remove the ->data_dot_entry_p and ->data_dotdot_entry_p methods
Date: Mon, 4 Nov 2019 12:37:34 -0800 [thread overview]
Message-ID: <20191104203734.GY4153244@magnolia> (raw)
In-Reply-To: <20191101220719.29100-24-hch@lst.de>
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@lst.de>
> ---
> 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
>
next prev parent reply other threads:[~2019-11-04 20:37 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 22:06 remove m_dirops Christoph Hellwig
2019-11-01 22:06 ` [PATCH 01/34] xfs: move incore structures out of xfs_da_format.h Christoph Hellwig
2019-11-04 18:21 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 02/34] xfs: refactor btree node scrubbing Christoph Hellwig
2019-11-04 18:36 ` Darrick J. Wong
2019-11-05 1:35 ` Christoph Hellwig
2019-11-01 22:06 ` [PATCH 03/34] xfs: devirtualize ->node_hdr_from_disk Christoph Hellwig
2019-11-04 18:37 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 04/34] xfs: devirtualize ->node_hdr_to_disk Christoph Hellwig
2019-11-04 18:39 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 05/34] xfs: add a btree entries pointer to struct xfs_da3_icnode_hdr Christoph Hellwig
2019-11-04 19:52 ` Darrick J. Wong
2019-11-05 1:38 ` Christoph Hellwig
2019-11-05 1:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 06/34] xfs: move the node header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 19:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 07/34] xfs: devirtualize ->leaf_hdr_from_disk Christoph Hellwig
2019-11-04 19:59 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 08/34] xfs: devirtualize ->leaf_hdr_to_disk Christoph Hellwig
2019-11-04 20:00 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 09/34] xfs: add a entries pointer to struct xfs_dir3_icleaf_hdr Christoph Hellwig
2019-11-04 20:04 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 10/34] xfs: move the dir2 leaf header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:05 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 11/34] xfs: move the max dir2 leaf entries count " Christoph Hellwig
2019-11-04 20:07 ` Darrick J. Wong
2019-11-05 1:42 ` Christoph Hellwig
2019-11-05 1:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 12/34] xfs: devirtualize ->free_hdr_from_disk Christoph Hellwig
2019-11-04 20:08 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 13/34] xfs: devirtualize ->free_hdr_to_disk Christoph Hellwig
2019-11-04 20:08 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 14/34] xfs: make the xfs_dir3_icfree_hdr available to xfs_dir2_node_addname_int Christoph Hellwig
2019-11-04 20:25 ` Darrick J. Wong
2019-11-05 1:52 ` Christoph Hellwig
2019-11-05 1:59 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 15/34] xfs: add a bests pointer to struct xfs_dir3_icfree_hdr Christoph Hellwig
2019-11-04 20:21 ` Darrick J. Wong
2019-11-05 1:44 ` Christoph Hellwig
2019-11-05 2:05 ` Darrick J. Wong
2019-11-05 16:44 ` Christoph Hellwig
2019-11-01 22:07 ` [PATCH 16/34] xfs: move the dir2 free header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:22 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 17/34] xfs: move the max dir2 free bests count " Christoph Hellwig
2019-11-04 20:23 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex Christoph Hellwig
2019-11-04 20:26 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 19/34] xfs: devirtualize ->sf_get_parent_ino and ->sf_put_parent_ino Christoph Hellwig
2019-11-04 20:26 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 20/34] xfs: devirtualize ->sf_entsize and ->sf_nextentry Christoph Hellwig
2019-11-04 20:28 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 21/34] xfs: devirtualize ->sf_get_ino and ->sf_put_ino Christoph Hellwig
2019-11-04 20:33 ` Darrick J. Wong
2019-11-07 1:05 ` Darrick J. Wong
2019-11-07 8:29 ` Christoph Hellwig
2019-11-01 22:07 ` [PATCH 22/34] xfs: devirtualize ->sf_get_ftype and ->sf_put_ftype Christoph Hellwig
2019-11-04 20:34 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 23/34] xfs: remove the ->data_dot_entry_p and ->data_dotdot_entry_p methods Christoph Hellwig
2019-11-04 20:37 ` Darrick J. Wong [this message]
2019-11-01 22:07 ` [PATCH 24/34] xfs: remove the unused ->data_first_entry_p method Christoph Hellwig
2019-11-04 20:38 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 25/34] xfs: remove the ->data_entry_entry_p method Christoph Hellwig
2019-11-04 20:41 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 26/34] xfs: devirtualize ->data_entsize Christoph Hellwig
2019-11-04 20:45 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 27/34] xfs: devirtualize ->data_entry_tag_p Christoph Hellwig
2019-11-04 20:45 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 28/34] xfs: move the dir2 data block fixed offsets to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:46 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 29/34] xfs: cleanup xfs_dir2_data_entsize Christoph Hellwig
2019-11-04 20:48 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 30/34] xfs: devirtualize ->data_bestfree_p Christoph Hellwig
2019-11-04 20:49 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 31/34] xfs: devirtualize ->data_get_ftype and ->data_put_ftype Christoph Hellwig
2019-11-04 20:50 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 32/34] xfs: remove the now unused dir ops infrastructure Christoph Hellwig
2019-11-04 20:50 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 33/34] xfs: merge xfs_dir2_data_freescan and xfs_dir2_data_freescan_int Christoph Hellwig
2019-11-04 20:51 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 34/34] xfs: always pass a valid hdr to xfs_dir3_leaf_check_int Christoph Hellwig
2019-11-04 20:53 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191104203734.GY4153244@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).