From: Christoph Hellwig <hch@lst.de>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, hch@lst.de
Subject: Re: [PATCH 05/11] xfs: remove flags argument from xfs_inode_ag_walk
Date: Wed, 20 May 2020 08:38:25 +0200 [thread overview]
Message-ID: <20200520063825.GE2742@lst.de> (raw)
In-Reply-To: <158993914950.976105.8586367797907212993.stgit@magnolia>
On Tue, May 19, 2020 at 06:45:49PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The incore inode walk code passes a flags argument and a pointer from
> the xfs_inode_ag_iterator caller all the way to the iteration function.
> We can reduce the function complexity by passing flags through the
> private pointer.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_icache.c | 38 ++++++++++++++------------------------
> fs/xfs/xfs_icache.h | 4 ++--
> fs/xfs/xfs_qm_syscalls.c | 25 +++++++++++++++++--------
> 3 files changed, 33 insertions(+), 34 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index e716b19879c6..87b98bfdf27d 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -790,9 +790,7 @@ STATIC int
> xfs_inode_ag_walk(
> struct xfs_mount *mp,
> struct xfs_perag *pag,
> - int (*execute)(struct xfs_inode *ip, int flags,
> - void *args),
> - int flags,
> + int (*execute)(struct xfs_inode *ip, void *args),
> void *args,
> int tag,
> int iter_flags)
> @@ -868,7 +866,7 @@ xfs_inode_ag_walk(
> if ((iter_flags & XFS_AGITER_INEW_WAIT) &&
> xfs_iflags_test(batch[i], XFS_INEW))
> xfs_inew_wait(batch[i]);
> - error = execute(batch[i], flags, args);
> + error = execute(batch[i], args);
> xfs_irele(batch[i]);
> if (error == -EAGAIN) {
> skipped++;
> @@ -972,9 +970,7 @@ int
> xfs_inode_ag_iterator(
> struct xfs_mount *mp,
> int iter_flags,
> - int (*execute)(struct xfs_inode *ip, int flags,
> - void *args),
> - int flags,
> + int (*execute)(struct xfs_inode *ip, void *args),
> void *args,
> int tag)
> {
> @@ -986,7 +982,7 @@ xfs_inode_ag_iterator(
> ag = 0;
> while ((pag = xfs_ici_walk_get_perag(mp, ag, tag))) {
> ag = pag->pag_agno + 1;
> - error = xfs_inode_ag_walk(mp, pag, execute, flags, args, tag,
> + error = xfs_inode_ag_walk(mp, pag, execute, args, tag,
> iter_flags);
> xfs_perag_put(pag);
> if (error) {
> @@ -1443,12 +1439,14 @@ xfs_inode_match_id_union(
> STATIC int
> xfs_inode_free_eofblocks(
> struct xfs_inode *ip,
> - int flags,
> void *args)
> {
> - int ret = 0;
> - struct xfs_eofblocks *eofb = args;
> - int match;
> + struct xfs_eofblocks *eofb = args;
> + bool wait;
> + int match;
> + int ret = 0;
> +
> + wait = (eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC));
No need for the outer braces.
> @@ -1484,7 +1481,7 @@ xfs_inode_free_eofblocks(
> * scanner moving and revisit the inode in a subsequent pass.
> */
> if (!xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL)) {
> - if (flags & SYNC_WAIT)
> + if (wait)
> ret = -EAGAIN;
> return ret;
Just me, but I'd prefer an explicit:
if (wait)
return -EAGAIN;
return 0;
here. Not really new in this patch, but if you touch this area anyway..
> index a9460bdcca87..571ecb17b3bf 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -726,12 +726,17 @@ xfs_qm_scall_getquota_next(
> return error;
> }
>
> +struct xfs_dqrele {
> + uint flags;
> +};
> + struct xfs_dqrele dqr = {
> + .flags = flags,
> + };
Instead of a new structure we could just take the address of flags and
pass that to simplify the code a bit.
next prev parent reply other threads:[~2020-05-20 6:38 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 1:45 [PATCH v3 00/11] xfs: refactor incore inode walking Darrick J. Wong
2020-05-20 1:45 ` [PATCH 01/11] xfs: move eofblocks conversion function to xfs_ioctl.c Darrick J. Wong
2020-05-20 6:30 ` Christoph Hellwig
2020-05-20 1:45 ` [PATCH 02/11] xfs: replace open-coded XFS_ICI_NO_TAG Darrick J. Wong
2020-05-20 6:30 ` Christoph Hellwig
2020-05-20 1:45 ` [PATCH 03/11] xfs: remove unused xfs_inode_ag_iterator function Darrick J. Wong
2020-05-20 6:30 ` Christoph Hellwig
2020-05-20 1:45 ` [PATCH 04/11] xfs: remove xfs_inode_ag_iterator_flags Darrick J. Wong
2020-05-20 6:35 ` Christoph Hellwig
2020-05-20 1:45 ` [PATCH 05/11] xfs: remove flags argument from xfs_inode_ag_walk Darrick J. Wong
2020-05-20 6:38 ` Christoph Hellwig [this message]
2020-05-20 18:36 ` Darrick J. Wong
2020-05-21 9:02 ` Christoph Hellwig
2020-05-20 1:45 ` [PATCH 06/11] xfs: remove __xfs_icache_free_eofblocks Darrick J. Wong
2020-05-20 6:38 ` Christoph Hellwig
2020-05-20 1:46 ` [PATCH 07/11] xfs: refactor eofb matching into a single helper Darrick J. Wong
2020-05-20 6:42 ` Christoph Hellwig
2020-05-20 18:35 ` Darrick J. Wong
2020-05-20 1:46 ` [PATCH 08/11] xfs: fix inode ag walk predicate function return values Darrick J. Wong
2020-05-20 6:42 ` Christoph Hellwig
2020-05-20 1:46 ` [PATCH 09/11] xfs: use bool for done in xfs_inode_ag_walk Darrick J. Wong
2020-05-20 6:43 ` Christoph Hellwig
2020-05-20 1:46 ` [PATCH 10/11] xfs: move xfs_inode_ag_iterator to be closer to the perag walking code Darrick J. Wong
2020-05-20 6:43 ` Christoph Hellwig
2020-05-20 1:46 ` [PATCH 11/11] xfs: hide most of the incore inode walk interface Darrick J. Wong
2020-05-20 6:46 ` Christoph Hellwig
2020-05-20 18:54 ` Darrick J. Wong
2020-05-21 9:05 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2020-01-01 1:05 [PATCH v2 00/11] xfs: refactor incore inode walking Darrick J. Wong
2020-01-01 1:06 ` [PATCH 05/11] xfs: remove flags argument from xfs_inode_ag_walk 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=20200520063825.GE2742@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 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.