Commit 182696fb authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: rename _zone variables to _cache 



Now that we've gotten rid of the kmem_zone_t typedef, rename the
variables to _cache since that's what they are.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChandan Babu R <chandan.babu@oracle.com>
parent e7720afa

fs/xfs/libxfs/xfs_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "xfs_ag_resv.h"

#include "xfs_bmap.h"



extern struct kmem_cache	*xfs_bmap_free_item_zone;

extern struct kmem_cache	*xfs_bmap_free_item_cache;



struct workqueue_struct *xfs_alloc_wq;
@@ -2459,10 +2459,10 @@ xfs_defer_agfl_block( 
	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_extent_free_item	*new;		/* new element */



	ASSERT(xfs_bmap_free_item_zone != NULL);

	ASSERT(xfs_bmap_free_item_cache != NULL);

	ASSERT(oinfo != NULL);



	new = kmem_cache_alloc(xfs_bmap_free_item_zone,

	new = kmem_cache_alloc(xfs_bmap_free_item_cache,

			       GFP_KERNEL | __GFP_NOFAIL);

	new->xefi_startblock = XFS_AGB_TO_FSB(mp, agno, agbno);

	new->xefi_blockcount = 1;

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ xfs_attr_fork_remove( 
	ASSERT(ip->i_afp->if_nextents == 0);



	xfs_idestroy_fork(ip->i_afp);

	kmem_cache_free(xfs_ifork_zone, ip->i_afp);

	kmem_cache_free(xfs_ifork_cache, ip->i_afp);

	ip->i_afp = NULL;

	ip->i_forkoff = 0;

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

fs/xfs/libxfs/xfs_bmap.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include "xfs_iomap.h"





struct kmem_cache		*xfs_bmap_free_item_zone;

struct kmem_cache		*xfs_bmap_free_item_cache;



/*

 * Miscellaneous helper functions
@@ -555,9 +555,9 @@ __xfs_bmap_add_free( 
	ASSERT(len < mp->m_sb.sb_agblocks);

	ASSERT(agbno + len <= mp->m_sb.sb_agblocks);

#endif

	ASSERT(xfs_bmap_free_item_zone != NULL);

	ASSERT(xfs_bmap_free_item_cache != NULL);



	new = kmem_cache_alloc(xfs_bmap_free_item_zone,

	new = kmem_cache_alloc(xfs_bmap_free_item_cache,

			       GFP_KERNEL | __GFP_NOFAIL);

	new->xefi_startblock = bno;

	new->xefi_blockcount = (xfs_extlen_t)len;

fs/xfs/libxfs/xfs_bmap.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ struct xfs_inode; 
struct xfs_mount;

struct xfs_trans;



extern struct kmem_cache	*xfs_bmap_free_item_zone;

extern struct kmem_cache	*xfs_bmap_free_item_cache;



/*

 * Argument structure for xfs_bmap_alloc.

fs/xfs/libxfs/xfs_da_btree.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ STATIC int xfs_da3_blk_unlink(xfs_da_state_t *state, 
				  xfs_da_state_blk_t *save_blk);





struct kmem_cache *xfs_da_state_zone;	/* anchor for state struct zone */

struct kmem_cache	*xfs_da_state_cache;	/* anchor for dir/attr state */



/*

 * Allocate a dir-state structure.
@@ -84,7 +84,7 @@ xfs_da_state_alloc( 
{

	struct xfs_da_state	*state;



	state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);

	state = kmem_cache_zalloc(xfs_da_state_cache, GFP_NOFS | __GFP_NOFAIL);

	state->args = args;

	state->mp = args->dp->i_mount;

	return state;
@@ -113,7 +113,7 @@ xfs_da_state_free(xfs_da_state_t *state) 
#ifdef DEBUG

	memset((char *)state, 0, sizeof(*state));

#endif /* DEBUG */

	kmem_cache_free(xfs_da_state_zone, state);

	kmem_cache_free(xfs_da_state_cache, state);

}



static inline int xfs_dabuf_nfsb(struct xfs_mount *mp, int whichfork)