Commit 042f65f4 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: straighten out all the naming around incore inode tree walks

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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 5662d38c
...@@ -767,12 +767,12 @@ xfs_icache_inode_is_allocated( ...@@ -767,12 +767,12 @@ xfs_icache_inode_is_allocated(
* ignore it. * ignore it.
*/ */
STATIC bool STATIC bool
xfs_inode_ag_walk_grab( xfs_inode_walk_ag_grab(
struct xfs_inode *ip, struct xfs_inode *ip,
int flags) int flags)
{ {
struct inode *inode = VFS_I(ip); 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()); ASSERT(rcu_read_lock_held());
...@@ -816,7 +816,7 @@ xfs_inode_ag_walk_grab( ...@@ -816,7 +816,7 @@ xfs_inode_ag_walk_grab(
* inodes with the given radix tree @tag. * inodes with the given radix tree @tag.
*/ */
STATIC int STATIC int
xfs_inode_ag_walk( xfs_inode_walk_ag(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_perag *pag, struct xfs_perag *pag,
int (*execute)(struct xfs_inode *ip, void *args), int (*execute)(struct xfs_inode *ip, void *args),
...@@ -864,7 +864,7 @@ xfs_inode_ag_walk( ...@@ -864,7 +864,7 @@ xfs_inode_ag_walk(
for (i = 0; i < nr_found; i++) { for (i = 0; i < nr_found; i++) {
struct xfs_inode *ip = batch[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; batch[i] = NULL;
/* /*
...@@ -892,7 +892,7 @@ xfs_inode_ag_walk( ...@@ -892,7 +892,7 @@ xfs_inode_ag_walk(
for (i = 0; i < nr_found; i++) { for (i = 0; i < nr_found; i++) {
if (!batch[i]) if (!batch[i])
continue; continue;
if ((iter_flags & XFS_AGITER_INEW_WAIT) && if ((iter_flags & XFS_INODE_WALK_INEW_WAIT) &&
xfs_iflags_test(batch[i], XFS_INEW)) xfs_iflags_test(batch[i], XFS_INEW))
xfs_inew_wait(batch[i]); xfs_inew_wait(batch[i]);
error = execute(batch[i], args); error = execute(batch[i], args);
...@@ -937,7 +937,7 @@ xfs_inode_walk_get_perag( ...@@ -937,7 +937,7 @@ xfs_inode_walk_get_perag(
* @tag. * @tag.
*/ */
int int
xfs_inode_ag_iterator( xfs_inode_walk(
struct xfs_mount *mp, struct xfs_mount *mp,
int iter_flags, int iter_flags,
int (*execute)(struct xfs_inode *ip, void *args), int (*execute)(struct xfs_inode *ip, void *args),
...@@ -952,7 +952,7 @@ xfs_inode_ag_iterator( ...@@ -952,7 +952,7 @@ xfs_inode_ag_iterator(
ag = 0; ag = 0;
while ((pag = xfs_inode_walk_get_perag(mp, ag, tag))) { while ((pag = xfs_inode_walk_get_perag(mp, ag, tag))) {
ag = pag->pag_agno + 1; 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); iter_flags);
xfs_perag_put(pag); xfs_perag_put(pag);
if (error) { if (error) {
...@@ -1548,7 +1548,7 @@ xfs_icache_free_eofblocks( ...@@ -1548,7 +1548,7 @@ xfs_icache_free_eofblocks(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_eofblocks *eofb) 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); XFS_ICI_EOFBLOCKS_TAG);
} }
...@@ -1798,7 +1798,7 @@ xfs_icache_free_cowblocks( ...@@ -1798,7 +1798,7 @@ xfs_icache_free_cowblocks(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_eofblocks *eofb) 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); XFS_ICI_COWBLOCKS_TAG);
} }
......
...@@ -24,7 +24,7 @@ struct xfs_eofblocks { ...@@ -24,7 +24,7 @@ struct xfs_eofblocks {
* tags for inode radix tree * tags for inode radix tree
*/ */
#define XFS_ICI_NO_TAG (-1) /* special flag for an untagged lookup #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_RECLAIM_TAG 0 /* inode is to be reclaimed */
#define XFS_ICI_EOFBLOCKS_TAG 1 /* inode has blocks beyond EOF */ #define XFS_ICI_EOFBLOCKS_TAG 1 /* inode has blocks beyond EOF */
#define XFS_ICI_COWBLOCKS_TAG 2 /* inode can have cow blocks to gc */ #define XFS_ICI_COWBLOCKS_TAG 2 /* inode can have cow blocks to gc */
...@@ -40,7 +40,7 @@ struct xfs_eofblocks { ...@@ -40,7 +40,7 @@ struct xfs_eofblocks {
/* /*
* flags for AG inode iterator * 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, int xfs_iget(struct xfs_mount *mp, struct xfs_trans *tp, xfs_ino_t ino,
uint flags, uint lock_flags, xfs_inode_t **ipp); uint flags, uint lock_flags, xfs_inode_t **ipp);
...@@ -71,7 +71,7 @@ int xfs_inode_free_quota_cowblocks(struct xfs_inode *ip); ...@@ -71,7 +71,7 @@ int xfs_inode_free_quota_cowblocks(struct xfs_inode *ip);
void xfs_cowblocks_worker(struct work_struct *); void xfs_cowblocks_worker(struct work_struct *);
void xfs_queue_cowblocks(struct xfs_mount *); 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), int (*execute)(struct xfs_inode *ip, void *args),
void *args, int tag); void *args, int tag);
......
...@@ -781,6 +781,6 @@ xfs_qm_dqrele_all_inodes( ...@@ -781,6 +781,6 @@ xfs_qm_dqrele_all_inodes(
uint flags) uint flags)
{ {
ASSERT(mp->m_quotainfo); 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); &flags, XFS_ICI_NO_TAG);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment