From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 28/46] xfs: remove the ->data_unused_p method
Date: Thu, 7 Nov 2019 16:51:24 -0800 [thread overview]
Message-ID: <20191108005124.GZ6219@magnolia> (raw)
In-Reply-To: <20191107182410.12660-29-hch@lst.de>
On Thu, Nov 07, 2019 at 07:23:52PM +0100, Christoph Hellwig wrote:
> Replace the two users of the ->data_unused_p dir ops method with a
> direct calculation using ->data_entry_offset, and clean them up a bit.
> xfs_dir2_sf_to_block already had an offset variable containing the
> value of ->data_entry_offset, which we are now reusing to make it
> clear that the initial freespace entry is at the same place that
> we later fill in the 1 entry, and in xfs_dir3_data_init the function
> is cleaned up a bit to keep the initialization of fields of a given
> structure close to each other, and to avoid a local variable.
>
> 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 | 17 ---------------
> fs/xfs/libxfs/xfs_dir2.h | 2 --
> fs/xfs/libxfs/xfs_dir2_block.c | 2 +-
> fs/xfs/libxfs/xfs_dir2_data.c | 40 +++++++++++++++-------------------
> 4 files changed, 19 insertions(+), 42 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
> index 711faff4aea2..347092ec28ab 100644
> --- a/fs/xfs/libxfs/xfs_da_format.c
> +++ b/fs/xfs/libxfs/xfs_da_format.c
> @@ -130,13 +130,6 @@ xfs_dir2_data_entry_p(struct xfs_dir2_data_hdr *hdr)
> ((char *)hdr + sizeof(struct xfs_dir2_data_hdr));
> }
>
> -static struct xfs_dir2_data_unused *
> -xfs_dir2_data_unused_p(struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_unused *)
> - ((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)
> {
> @@ -144,13 +137,6 @@ xfs_dir3_data_entry_p(struct xfs_dir2_data_hdr *hdr)
> ((char *)hdr + sizeof(struct xfs_dir3_data_hdr));
> }
>
> -static struct xfs_dir2_data_unused *
> -xfs_dir3_data_unused_p(struct xfs_dir2_data_hdr *hdr)
> -{
> - return (struct xfs_dir2_data_unused *)
> - ((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,
> @@ -164,7 +150,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
> .data_entry_offset = sizeof(struct xfs_dir2_data_hdr),
>
> .data_entry_p = xfs_dir2_data_entry_p,
> - .data_unused_p = xfs_dir2_data_unused_p,
> };
>
> static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
> @@ -180,7 +165,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
> .data_entry_offset = sizeof(struct xfs_dir2_data_hdr),
>
> .data_entry_p = xfs_dir2_data_entry_p,
> - .data_unused_p = xfs_dir2_data_unused_p,
> };
>
> static const struct xfs_dir_ops xfs_dir3_ops = {
> @@ -196,7 +180,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
> .data_entry_offset = sizeof(struct xfs_dir3_data_hdr),
>
> .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 8bfcf4c1b9c4..75aec05aae10 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -45,8 +45,6 @@ struct xfs_dir_ops {
>
> struct xfs_dir2_data_entry *
> (*data_entry_p)(struct xfs_dir2_data_hdr *hdr);
> - struct xfs_dir2_data_unused *
> - (*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
> };
>
> extern const struct xfs_dir_ops *
> diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
> index e7719356829d..9061f378d52a 100644
> --- a/fs/xfs/libxfs/xfs_dir2_block.c
> +++ b/fs/xfs/libxfs/xfs_dir2_block.c
> @@ -1112,7 +1112,7 @@ xfs_dir2_sf_to_block(
> * The whole thing is initialized to free by the init routine.
> * Say we're using the leaf and tail area.
> */
> - dup = dp->d_ops->data_unused_p(hdr);
> + dup = bp->b_addr + offset;
> needlog = needscan = 0;
> error = xfs_dir2_data_use_free(args, bp, dup, args->geo->blksize - i,
> i, &needlog, &needscan);
> diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c
> index 2c79be4c3153..3ecec8e1c5f6 100644
> --- a/fs/xfs/libxfs/xfs_dir2_data.c
> +++ b/fs/xfs/libxfs/xfs_dir2_data.c
> @@ -631,24 +631,20 @@ xfs_dir2_data_freescan(
> */
> int /* error */
> xfs_dir3_data_init(
> - xfs_da_args_t *args, /* directory operation args */
> - xfs_dir2_db_t blkno, /* logical dir block number */
> - struct xfs_buf **bpp) /* output block buffer */
> + struct xfs_da_args *args, /* directory operation args */
> + xfs_dir2_db_t blkno, /* logical dir block number */
> + struct xfs_buf **bpp) /* output block buffer */
> {
> - struct xfs_buf *bp; /* block buffer */
> - xfs_dir2_data_hdr_t *hdr; /* data block header */
> - xfs_inode_t *dp; /* incore directory inode */
> - xfs_dir2_data_unused_t *dup; /* unused entry pointer */
> - struct xfs_dir2_data_free *bf;
> - int error; /* error return value */
> - int i; /* bestfree index */
> - xfs_mount_t *mp; /* filesystem mount point */
> - xfs_trans_t *tp; /* transaction pointer */
> - int t; /* temp */
> -
> - dp = args->dp;
> - mp = dp->i_mount;
> - tp = args->trans;
> + struct xfs_trans *tp = args->trans;
> + struct xfs_inode *dp = args->dp;
> + struct xfs_mount *mp = dp->i_mount;
> + struct xfs_buf *bp;
> + struct xfs_dir2_data_hdr *hdr;
> + struct xfs_dir2_data_unused *dup;
> + struct xfs_dir2_data_free *bf;
> + int error;
> + int i;
> +
> /*
> * Get the buffer set up for the block.
> */
> @@ -677,6 +673,8 @@ xfs_dir3_data_init(
>
> bf = dp->d_ops->data_bestfree_p(hdr);
> bf[0].offset = cpu_to_be16(dp->d_ops->data_entry_offset);
> + bf[0].length =
> + cpu_to_be16(args->geo->blksize - dp->d_ops->data_entry_offset);
> for (i = 1; i < XFS_DIR2_DATA_FD_COUNT; i++) {
> bf[i].length = 0;
> bf[i].offset = 0;
> @@ -685,13 +683,11 @@ xfs_dir3_data_init(
> /*
> * Set up an unused entry for the block's body.
> */
> - dup = dp->d_ops->data_unused_p(hdr);
> + dup = bp->b_addr + dp->d_ops->data_entry_offset;
> dup->freetag = cpu_to_be16(XFS_DIR2_DATA_FREE_TAG);
> -
> - t = args->geo->blksize - (uint)dp->d_ops->data_entry_offset;
> - bf[0].length = cpu_to_be16(t);
> - dup->length = cpu_to_be16(t);
> + dup->length = bf[0].length;
> *xfs_dir2_data_unused_tag_p(dup) = cpu_to_be16((char *)dup - (char *)hdr);
> +
> /*
> * Log it and return it.
> */
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-11-08 0:51 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 18:23 remove m_dirops v2 Christoph Hellwig
2019-11-07 18:23 ` [PATCH 01/46] xfs: move incore structures out of xfs_da_format.h Christoph Hellwig
2019-11-07 18:23 ` [PATCH 02/46] xfs: use unsigned int for all size values in struct xfs_da_geometry Christoph Hellwig
2019-11-07 22:33 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 03/46] xfs: refactor btree node scrubbing Christoph Hellwig
2019-11-07 22:43 ` Darrick J. Wong
2019-11-08 5:28 ` Christoph Hellwig
2019-11-07 18:23 ` [PATCH 04/46] xfs: devirtualize ->node_hdr_from_disk Christoph Hellwig
2019-11-07 18:23 ` [PATCH 05/46] xfs: devirtualize ->node_hdr_to_disk Christoph Hellwig
2019-11-07 18:23 ` [PATCH 06/46] xfs: add a btree entries pointer to struct xfs_da3_icnode_hdr Christoph Hellwig
2019-11-08 0:21 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 07/46] xfs: move the node header size to struct xfs_da_geometry Christoph Hellwig
2019-11-07 18:23 ` [PATCH 08/46] xfs: devirtualize ->leaf_hdr_from_disk Christoph Hellwig
2019-11-07 18:23 ` [PATCH 09/46] xfs: devirtualize ->leaf_hdr_to_disk Christoph Hellwig
2019-11-07 18:23 ` [PATCH 10/46] xfs: add a entries pointer to struct xfs_dir3_icleaf_hdr Christoph Hellwig
2019-11-08 0:28 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 11/46] xfs: move the dir2 leaf header size to struct xfs_da_geometry Christoph Hellwig
2019-11-07 18:23 ` [PATCH 12/46] xfs: move the max dir2 leaf entries count " Christoph Hellwig
2019-11-07 18:23 ` [PATCH 13/46] xfs: devirtualize ->free_hdr_from_disk Christoph Hellwig
2019-11-07 18:23 ` [PATCH 14/46] xfs: devirtualize ->free_hdr_to_disk Christoph Hellwig
2019-11-07 18:23 ` [PATCH 15/46] xfs: make the xfs_dir3_icfree_hdr available to xfs_dir2_node_addname_int Christoph Hellwig
2019-11-08 1:06 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 16/46] xfs: add a bests pointer to struct xfs_dir3_icfree_hdr Christoph Hellwig
2019-11-08 0:34 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 17/46] xfs: move the dir2 free header size to struct xfs_da_geometry Christoph Hellwig
2019-11-08 0:34 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 18/46] xfs: move the max dir2 free bests count " Christoph Hellwig
2019-11-07 18:23 ` [PATCH 19/46] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex Christoph Hellwig
2019-11-07 18:23 ` [PATCH 20/46] xfs: devirtualize ->sf_get_parent_ino and ->sf_put_parent_ino Christoph Hellwig
2019-11-07 18:23 ` [PATCH 21/46] xfs: devirtualize ->sf_entsize and ->sf_nextentry Christoph Hellwig
2019-11-07 18:23 ` [PATCH 22/46] xfs: devirtualize ->sf_get_ino and ->sf_put_ino Christoph Hellwig
2019-11-08 0:36 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 23/46] xfs: devirtualize ->sf_get_ftype and ->sf_put_ftype Christoph Hellwig
2019-11-07 18:23 ` [PATCH 24/46] xfs: remove the unused ->data_first_entry_p method Christoph Hellwig
2019-11-07 18:23 ` [PATCH 25/46] xfs: remove the data_dot_offset field in struct xfs_dir_ops Christoph Hellwig
2019-11-08 0:38 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 26/46] xfs: remove the data_dotdot_offset " Christoph Hellwig
2019-11-08 0:50 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 27/46] xfs: remove the ->data_dot_entry_p and ->data_dotdot_entry_p methods Christoph Hellwig
2019-11-08 0:49 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 28/46] xfs: remove the ->data_unused_p method Christoph Hellwig
2019-11-08 0:51 ` Darrick J. Wong [this message]
2019-11-07 18:23 ` [PATCH 29/46] xfs: cleanup xfs_dir2_block_getdents Christoph Hellwig
2019-11-08 0:52 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 30/46] xfs: cleanup xfs_dir2_leaf_getdents Christoph Hellwig
2019-11-07 22:41 ` Darrick J. Wong
2019-11-08 5:26 ` Christoph Hellwig
2019-11-07 18:23 ` [PATCH 31/46] xfs: cleanup xchk_dir_rec Christoph Hellwig
2019-11-08 0:57 ` Darrick J. Wong
2019-11-08 5:38 ` Christoph Hellwig
2019-11-07 18:23 ` [PATCH 32/46] xfs: cleanup xchk_directory_data_bestfree Christoph Hellwig
2019-11-08 0:57 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 33/46] xfs: cleanup xfs_dir2_block_to_sf Christoph Hellwig
2019-11-08 0:59 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 34/46] xfs: cleanup xfs_dir2_data_freescan_int Christoph Hellwig
2019-11-08 1:00 ` Darrick J. Wong
2019-11-07 18:23 ` [PATCH 35/46] xfs: cleanup __xfs_dir3_data_check Christoph Hellwig
2019-11-08 1:01 ` Darrick J. Wong
2019-11-07 18:24 ` [PATCH 36/46] xfs: remove the now unused ->data_entry_p method Christoph Hellwig
2019-11-08 1:02 ` Darrick J. Wong
2019-11-07 18:24 ` [PATCH 37/46] xfs: replace xfs_dir3_data_endp with xfs_dir3_data_end_offset Christoph Hellwig
2019-11-08 1:04 ` Darrick J. Wong
2019-11-07 18:24 ` [PATCH 38/46] xfs: devirtualize ->data_entsize Christoph Hellwig
2019-11-07 18:24 ` [PATCH 39/46] xfs: devirtualize ->data_entry_tag_p Christoph Hellwig
2019-11-07 18:24 ` [PATCH 40/46] xfs: move the dir2 data block fixed offsets to struct xfs_da_geometry Christoph Hellwig
2019-11-07 18:24 ` [PATCH 41/46] xfs: cleanup xfs_dir2_data_entsize Christoph Hellwig
2019-11-08 1:05 ` Darrick J. Wong
2019-11-08 5:43 ` Christoph Hellwig
2019-11-07 18:24 ` [PATCH 42/46] xfs: devirtualize ->data_bestfree_p Christoph Hellwig
2019-11-07 18:24 ` [PATCH 43/46] xfs: devirtualize ->data_get_ftype and ->data_put_ftype Christoph Hellwig
2019-11-07 18:24 ` [PATCH 44/46] xfs: remove the now unused dir ops infrastructure Christoph Hellwig
2019-11-07 18:24 ` [PATCH 45/46] xfs: merge xfs_dir2_data_freescan and xfs_dir2_data_freescan_int Christoph Hellwig
2019-11-07 18:24 ` [PATCH 46/46] xfs: always pass a valid hdr to xfs_dir3_leaf_check_int Christoph Hellwig
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=20191108005124.GZ6219@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