From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 33/34] xfs: merge xfs_dir2_data_freescan and xfs_dir2_data_freescan_int
Date: Mon, 4 Nov 2019 12:51:14 -0800 [thread overview]
Message-ID: <20191104205113.GI4153244@magnolia> (raw)
In-Reply-To: <20191101220719.29100-34-hch@lst.de>
On Fri, Nov 01, 2019 at 03:07:18PM -0700, Christoph Hellwig wrote:
> There is no real need for xfs_dir2_data_freescan wrapper, so rename
> xfs_dir2_data_freescan_int to xfs_dir2_data_freescan and let the
> callers dereference the mount pointer from the inode.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Seems reasonable to me,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/libxfs/xfs_dir2.h | 4 +---
> fs/xfs/libxfs/xfs_dir2_block.c | 10 +++++-----
> fs/xfs/libxfs/xfs_dir2_data.c | 11 +----------
> fs/xfs/libxfs/xfs_dir2_leaf.c | 6 +++---
> fs/xfs/libxfs/xfs_dir2_node.c | 4 ++--
> 5 files changed, 12 insertions(+), 23 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index ccdbc612fb76..8bf4cf227740 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -66,9 +66,7 @@ extern int xfs_dir2_isleaf(struct xfs_da_args *args, int *r);
> extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
> struct xfs_buf *bp);
>
> -extern void xfs_dir2_data_freescan_int(struct xfs_mount *mp,
> - struct xfs_dir2_data_hdr *hdr, int *loghead);
> -extern void xfs_dir2_data_freescan(struct xfs_inode *dp,
> +extern void xfs_dir2_data_freescan(struct xfs_mount *mp,
> struct xfs_dir2_data_hdr *hdr, int *loghead);
> extern void xfs_dir2_data_log_entry(struct xfs_da_args *args,
> struct xfs_buf *bp, struct xfs_dir2_data_entry *dep);
> diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
> index 94d32e515478..4b3ea6730775 100644
> --- a/fs/xfs/libxfs/xfs_dir2_block.c
> +++ b/fs/xfs/libxfs/xfs_dir2_block.c
> @@ -311,7 +311,7 @@ xfs_dir2_block_compact(
> * This needs to happen before the next call to use_free.
> */
> if (needscan)
> - xfs_dir2_data_freescan(args->dp, hdr, needlog);
> + xfs_dir2_data_freescan(args->dp->i_mount, hdr, needlog);
> }
>
> /*
> @@ -458,7 +458,7 @@ xfs_dir2_block_addname(
> * This needs to happen before the next call to use_free.
> */
> if (needscan) {
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> needscan = 0;
> }
> /*
> @@ -548,7 +548,7 @@ xfs_dir2_block_addname(
> * Clean up the bestfree array and log the header, tail, and entry.
> */
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> if (needlog)
> xfs_dir2_data_log_header(args, bp);
> xfs_dir2_block_log_tail(tp, bp);
> @@ -807,7 +807,7 @@ xfs_dir2_block_removename(
> * Fix up bestfree, log the header if necessary.
> */
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> if (needlog)
> xfs_dir2_data_log_header(args, bp);
> xfs_dir3_data_check(dp, bp);
> @@ -1014,7 +1014,7 @@ xfs_dir2_leaf_to_block(
> * Scan the bestfree if we need it and log the data block header.
> */
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> if (needlog)
> xfs_dir2_data_log_header(args, dbp);
> /*
> diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c
> index 9752a0da5b95..4304c62796dd 100644
> --- a/fs/xfs/libxfs/xfs_dir2_data.c
> +++ b/fs/xfs/libxfs/xfs_dir2_data.c
> @@ -615,7 +615,7 @@ xfs_dir2_data_freeremove(
> * Given a data block, reconstruct its bestfree map.
> */
> void
> -xfs_dir2_data_freescan_int(
> +xfs_dir2_data_freescan(
> struct xfs_mount *mp,
> struct xfs_dir2_data_hdr *hdr,
> int *loghead)
> @@ -670,15 +670,6 @@ xfs_dir2_data_freescan_int(
> }
> }
>
> -void
> -xfs_dir2_data_freescan(
> - struct xfs_inode *dp,
> - struct xfs_dir2_data_hdr *hdr,
> - int *loghead)
> -{
> - return xfs_dir2_data_freescan_int(dp->i_mount, hdr, loghead);
> -}
> -
> /*
> * Initialize a data block at the given block number in the directory.
> * Give back the buffer for the created block.
> diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
> index ff54c8f08ded..6912264e081e 100644
> --- a/fs/xfs/libxfs/xfs_dir2_leaf.c
> +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
> @@ -465,7 +465,7 @@ xfs_dir2_block_to_leaf(
> hdr->magic = cpu_to_be32(XFS_DIR3_DATA_MAGIC);
>
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> /*
> * Set up leaf tail and bests table.
> */
> @@ -872,7 +872,7 @@ xfs_dir2_leaf_addname(
> * Need to scan fix up the bestfree table.
> */
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> /*
> * Need to log the data block's header.
> */
> @@ -1413,7 +1413,7 @@ xfs_dir2_leaf_removename(
> * log the data block header if necessary.
> */
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> if (needlog)
> xfs_dir2_data_log_header(args, dbp);
> /*
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index e51b103fd429..a131ed5e5f3b 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -1322,7 +1322,7 @@ xfs_dir2_leafn_remove(
> * Log the data block header if needed.
> */
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> if (needlog)
> xfs_dir2_data_log_header(args, dbp);
> xfs_dir3_data_check(dp, dbp);
> @@ -1970,7 +1970,7 @@ xfs_dir2_node_addname_int(
>
> /* Rescan the freespace and log the data block if needed. */
> if (needscan)
> - xfs_dir2_data_freescan(dp, hdr, &needlog);
> + xfs_dir2_data_freescan(dp->i_mount, hdr, &needlog);
> if (needlog)
> xfs_dir2_data_log_header(args, dbp);
>
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-11-04 20:51 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
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 [this message]
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=20191104205113.GI4153244@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).