From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org
Cc: linux-xfs@vger.kernel.org, hch@infradead.org
Subject: [PATCH 4/6] xfs: pass struct xfs_eofblocks to the inode scan callback
Date: Thu, 25 Mar 2021 17:21:35 -0700 [thread overview]
Message-ID: <161671809523.621936.2714947336807513527.stgit@magnolia> (raw)
In-Reply-To: <161671807287.621936.13471099564526590235.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Pass a pointer to the actual eofb structure around the inode scanner
functions instead of a void pointer, now that none of the functions is
used as a callback.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/xfs_icache.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index f4c4f6e15d77..b02b4b349ee9 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -27,7 +27,8 @@
#include <linux/iversion.h>
/* Forward declarations to reduce indirect calls */
-static int xfs_blockgc_scan_inode(struct xfs_inode *ip, void *args);
+static int xfs_blockgc_scan_inode(struct xfs_inode *ip,
+ struct xfs_eofblocks *eofb);
/*
* Allocate and initialise an xfs_inode.
@@ -776,7 +777,7 @@ STATIC int
xfs_inode_walk_ag(
struct xfs_perag *pag,
unsigned int tag,
- void *args)
+ struct xfs_eofblocks *eofb)
{
struct xfs_mount *mp = pag->pag_mount;
uint32_t first_index;
@@ -842,7 +843,7 @@ xfs_inode_walk_ag(
for (i = 0; i < nr_found; i++) {
if (!batch[i])
continue;
- error = xfs_blockgc_scan_inode(batch[i], args);
+ error = xfs_blockgc_scan_inode(batch[i], eofb);
xfs_irele(batch[i]);
if (error == -EAGAIN) {
skipped++;
@@ -875,7 +876,7 @@ static int
xfs_inode_walk(
struct xfs_mount *mp,
unsigned int tag,
- void *args)
+ struct xfs_eofblocks *eofb)
{
struct xfs_perag *pag;
int error = 0;
@@ -887,7 +888,7 @@ xfs_inode_walk(
ag = 0;
while ((pag = xfs_perag_get_tag(mp, ag, tag))) {
ag = pag->pag_agno + 1;
- error = xfs_inode_walk_ag(pag, tag, args);
+ error = xfs_inode_walk_ag(pag, tag, eofb);
xfs_perag_put(pag);
if (error) {
last_error = error;
@@ -1266,10 +1267,9 @@ xfs_reclaim_worker(
STATIC int
xfs_inode_free_eofblocks(
struct xfs_inode *ip,
- void *args,
+ struct xfs_eofblocks *eofb,
unsigned int *lockflags)
{
- struct xfs_eofblocks *eofb = args;
bool wait;
wait = eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC);
@@ -1473,10 +1473,9 @@ xfs_prep_free_cowblocks(
STATIC int
xfs_inode_free_cowblocks(
struct xfs_inode *ip,
- void *args,
+ struct xfs_eofblocks *eofb,
unsigned int *lockflags)
{
- struct xfs_eofblocks *eofb = args;
bool wait;
int ret = 0;
@@ -1571,16 +1570,16 @@ xfs_blockgc_start(
static int
xfs_blockgc_scan_inode(
struct xfs_inode *ip,
- void *args)
+ struct xfs_eofblocks *eofb)
{
unsigned int lockflags = 0;
int error;
- error = xfs_inode_free_eofblocks(ip, args, &lockflags);
+ error = xfs_inode_free_eofblocks(ip, eofb, &lockflags);
if (error)
goto unlock;
- error = xfs_inode_free_cowblocks(ip, args, &lockflags);
+ error = xfs_inode_free_cowblocks(ip, eofb, &lockflags);
unlock:
if (lockflags)
xfs_iunlock(ip, lockflags);
next prev parent reply other threads:[~2021-03-26 0:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 0:21 [PATCHSET v3 0/6] xfs: clean up incore inode walk functions Darrick J. Wong
2021-03-26 0:21 ` [PATCH 1/6] xfs: use s_inodes in xfs_qm_dqrele_all_inodes Darrick J. Wong
2021-03-30 0:44 ` Dave Chinner
2021-03-30 2:36 ` Darrick J. Wong
2021-03-30 3:07 ` Dave Chinner
2021-03-30 4:06 ` Darrick J. Wong
2021-03-31 1:34 ` Dave Chinner
2021-03-26 0:21 ` [PATCH 2/6] xfs: remove iter_flags parameter from xfs_inode_walk_* Darrick J. Wong
2021-03-26 6:04 ` Christoph Hellwig
2021-03-26 0:21 ` [PATCH 3/6] xfs: remove indirect calls from xfs_inode_walk{,_ag} Darrick J. Wong
2021-03-26 6:08 ` Christoph Hellwig
2021-03-26 0:21 ` Darrick J. Wong [this message]
2021-03-26 6:09 ` [PATCH 4/6] xfs: pass struct xfs_eofblocks to the inode scan callback Christoph Hellwig
2021-03-26 0:21 ` [PATCH 5/6] xfs: merge xfs_reclaim_inodes_ag into xfs_inode_walk_ag Darrick J. Wong
2021-03-26 6:30 ` Christoph Hellwig
2021-03-26 16:07 ` Darrick J. Wong
2021-03-26 0:21 ` [PATCH 6/6] xfs: refactor per-AG inode tagging functions Darrick J. Wong
2021-03-26 6:48 ` Christoph Hellwig
2021-03-26 16:34 ` 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=161671809523.621936.2714947336807513527.stgit@magnolia \
--to=djwong@kernel.org \
--cc=hch@infradead.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.