On Thu, May 21, 2020 at 07:54:38PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> We're not very consistent about function names for the incore inode
> iteration function. Turn them all into xfs_inode_walk* variants.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
Seems reasonable:
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_icache.c | 18 +++++++++---------
> fs/xfs/xfs_icache.h | 6 +++---
> fs/xfs/xfs_qm_syscalls.c | 2 +-
> 3 files changed, 13 insertions(+), 13 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 0e25d50372e2..baf59087caa5 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -747,12 +747,12 @@ xfs_icache_inode_is_allocated(
> * ignore it.
> */
> STATIC bool
> -xfs_inode_ag_walk_grab(
> +xfs_inode_walk_ag_grab(
> struct xfs_inode *ip,
> int flags)
> {
> struct inode *inode = VFS_I(ip);
> - bool newinos = !!(flags & XFS_AGITER_INEW_WAIT);
> + bool newinos = !!(flags & XFS_INODE_WALK_INEW_WAIT);
>
> ASSERT(rcu_read_lock_held());
>
> @@ -796,7 +796,7 @@ xfs_inode_ag_walk_grab(
> * inodes with the given radix tree @tag.
> */
> STATIC int
> -xfs_inode_ag_walk(
> +xfs_inode_walk_ag(
> struct xfs_mount *mp,
> struct xfs_perag *pag,
> int (*execute)(struct xfs_inode *ip, void *args),
> @@ -844,7 +844,7 @@ xfs_inode_ag_walk(
> for (i = 0; i < nr_found; i++) {
> struct xfs_inode *ip = batch[i];
>
> - if (done || !xfs_inode_ag_walk_grab(ip, iter_flags))
> + if (done || !xfs_inode_walk_ag_grab(ip, iter_flags))
> batch[i] = NULL;
>
> /*
> @@ -872,7 +872,7 @@ xfs_inode_ag_walk(
> for (i = 0; i < nr_found; i++) {
> if (!batch[i])
> continue;
> - if ((iter_flags & XFS_AGITER_INEW_WAIT) &&
> + if ((iter_flags & XFS_INODE_WALK_INEW_WAIT) &&
> xfs_iflags_test(batch[i], XFS_INEW))
> xfs_inew_wait(batch[i]);
> error = execute(batch[i], args);
> @@ -917,7 +917,7 @@ xfs_inode_walk_get_perag(
> * @tag.
> */
> int
> -xfs_inode_ag_iterator(
> +xfs_inode_walk(
> struct xfs_mount *mp,
> int iter_flags,
> int (*execute)(struct xfs_inode *ip, void *args),
> @@ -932,7 +932,7 @@ xfs_inode_ag_iterator(
> ag = 0;
> while ((pag = xfs_inode_walk_get_perag(mp, ag, tag))) {
> ag = pag->pag_agno + 1;
> - error = xfs_inode_ag_walk(mp, pag, execute, args, tag,
> + error = xfs_inode_walk_ag(mp, pag, execute, args, tag,
> iter_flags);
> xfs_perag_put(pag);
> if (error) {
> @@ -1528,7 +1528,7 @@ xfs_icache_free_eofblocks(
> struct xfs_mount *mp,
> struct xfs_eofblocks *eofb)
> {
> - return xfs_inode_ag_iterator(mp, 0, xfs_inode_free_eofblocks, eofb,
> + return xfs_inode_walk(mp, 0, xfs_inode_free_eofblocks, eofb,
> XFS_ICI_EOFBLOCKS_TAG);
> }
>
> @@ -1778,7 +1778,7 @@ xfs_icache_free_cowblocks(
> struct xfs_mount *mp,
> struct xfs_eofblocks *eofb)
> {
> - return xfs_inode_ag_iterator(mp, 0, xfs_inode_free_cowblocks, eofb,
> + return xfs_inode_walk(mp, 0, xfs_inode_free_cowblocks, eofb,
> XFS_ICI_COWBLOCKS_TAG);
> }
>
> diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
> index e7f86ebd7b22..93b54e7d55f0 100644
> --- a/fs/xfs/xfs_icache.h
> +++ b/fs/xfs/xfs_icache.h
> @@ -24,7 +24,7 @@ struct xfs_eofblocks {
> * tags for inode radix tree
> */
> #define XFS_ICI_NO_TAG (-1) /* special flag for an untagged lookup
> - in xfs_inode_ag_iterator */
> + in xfs_inode_walk */
> #define XFS_ICI_RECLAIM_TAG 0 /* inode is to be reclaimed */
> #define XFS_ICI_EOFBLOCKS_TAG 1 /* inode has blocks beyond EOF */
> #define XFS_ICI_COWBLOCKS_TAG 2 /* inode can have cow blocks to gc */
> @@ -40,7 +40,7 @@ struct xfs_eofblocks {
> /*
> * flags for AG inode iterator
> */
> -#define XFS_AGITER_INEW_WAIT 0x1 /* wait on new inodes */
> +#define XFS_INODE_WALK_INEW_WAIT 0x1 /* wait on new inodes */
>
> int xfs_iget(struct xfs_mount *mp, struct xfs_trans *tp, xfs_ino_t ino,
> uint flags, uint lock_flags, xfs_inode_t **ipp);
> @@ -71,7 +71,7 @@ int xfs_inode_free_quota_cowblocks(struct xfs_inode *ip);
> void xfs_cowblocks_worker(struct work_struct *);
> void xfs_queue_cowblocks(struct xfs_mount *);
>
> -int xfs_inode_ag_iterator(struct xfs_mount *mp, int iter_flags,
> +int xfs_inode_walk(struct xfs_mount *mp, int iter_flags,
> int (*execute)(struct xfs_inode *ip, void *args),
> void *args, int tag);
>
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index 4b61a683a43e..e8b63af93eb5 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -773,6 +773,6 @@ xfs_qm_dqrele_all_inodes(
> uint flags)
> {
> ASSERT(mp->m_quotainfo);
> - xfs_inode_ag_iterator(mp, XFS_AGITER_INEW_WAIT, xfs_dqrele_inode,
> + xfs_inode_walk(mp, XFS_INODE_WALK_INEW_WAIT, xfs_dqrele_inode,
> &flags, XFS_ICI_NO_TAG);
> }
>
