From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: "Darrick J . Wong" <darrick.wong@oracle.com>
Subject: [PATCH 45/46] xfs: merge xfs_dir2_data_freescan and xfs_dir2_data_freescan_int
Date: Thu, 7 Nov 2019 19:24:09 +0100 [thread overview]
Message-ID: <20191107182410.12660-46-hch@lst.de> (raw)
In-Reply-To: <20191107182410.12660-1-hch@lst.de>
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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
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 a0cd423c79dd..34e7a0b64205 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 0c481e55c981..358151ddfa75 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 0aa1d165c964..9e471a28b6c6 100644
--- a/fs/xfs/libxfs/xfs_dir2_data.c
+++ b/fs/xfs/libxfs/xfs_dir2_data.c
@@ -608,7 +608,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)
@@ -655,15 +655,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 bc301c973450..2c67a9e24bd0 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.
*/
@@ -1415,7 +1415,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 5551be7c29df..3f36769f15af 100644
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -1328,7 +1328,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);
@@ -1976,7 +1976,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-07 18:26 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
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 ` Christoph Hellwig [this message]
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=20191107182410.12660-46-hch@lst.de \
--to=hch@lst.de \
--cc=darrick.wong@oracle.com \
--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