[38/48] xfs: rename _zone variables to _cache

Message ID	164263840138.865554.3713835353478500099.stgit@magnolia (mailing list archive)
State	Accepted
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 38/48] xfs: rename _zone variables to _cache From: "Darrick J. Wong" <djwong@kernel.org> To: sandeen@sandeen.net, djwong@kernel.org Cc: Chandan Babu R <chandan.babu@oracle.com>, linux-xfs@vger.kernel.org Date: Wed, 19 Jan 2022 16:26:41 -0800 Message-ID: <164263840138.865554.3713835353478500099.stgit@magnolia> In-Reply-To: <164263819185.865554.6000499997543946756.stgit@magnolia> References: <164263819185.865554.6000499997543946756.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	xfsprogs: sync libxfs with 5.16 \| expand [PATCHSET,00/48] xfsprogs: sync libxfs with 5.16 [01/48] xfs: formalize the process of holding onto resources across a defer roll [02/48] xfs: port the defer ops capture and continue to resource capture [03/48] xfs: fix maxlevels comparisons in the btree staging code [04/48] xfs: remove xfs_btree_cur_t typedef [05/48] xfs: check that bc_nlevels never overflows [06/48] xfs: remove the xfs_dinode_t typedef [07/48] xfs: remove the xfs_dsb_t typedef [08/48] xfs: remove the xfs_dqblk_t typedef [09/48] xfs: fold perag loop iteration logic into helper function [10/48] xfs: rename the next_agno perag iteration variable [11/48] xfs: terminate perag iteration reliably on agcount [12/48] xfs: fix perag reference leak on iteration race with growfs [13/48] xfs: remove xfs_btree_cur.bc_blocklog [14/48] xfs: reduce the size of nr_ops for refcount btree cursors [15/48] xfs: prepare xfs_btree_cur for dynamic cursor heights [16/48] xfs: rearrange xfs_btree_cur fields for better packing [17/48] xfs: refactor btree cursor allocation function [18/48] xfs: encode the max btree height in the cursor [19/48] xfs: dynamically allocate cursors based on maxlevels [20/48] xfs: rename m_ag_maxlevels to m_allocbt_maxlevels [21/48] xfs: compute maximum AG btree height for critical reservation calculation [22/48] xfs: clean up xfs_btree_{calc_size,compute_maxlevels} [23/48] xfs: compute the maximum height of the rmap btree when reflink enabled [24/48] xfs_db: fix metadump level comparisons [25/48] xfs_db: warn about suspicious finobt trees when metadumping [26/48] xfs_db: stop using XFS_BTREE_MAXLEVELS [27/48] xfs_repair: fix AG header btree level comparisons [28/48] xfs_repair: warn about suspicious btree levels in AG headers [29/48] xfs_repair: stop using XFS_BTREE_MAXLEVELS [30/48] xfs: kill XFS_BTREE_MAXLEVELS [31/48] xfs: compute absolute maximum nlevels for each btree type [32/48] xfs: use separate btree cursor cache for each btree type [33/48] xfs_db: support computing btheight for all cursor types [34/48] xfs_db: report absolute maxlevels for each btree type [35/48] libxfs: remove kmem_zone_destroy [36/48] libxfs: remove kmem_zone_init [37/48] xfs: remove kmem_zone typedef [38/48] xfs: rename _zone variables to _cache [39/48] libxfs: rename all the other _zone variables to _cache [40/48] libxfs: change zone to cache for all kmem functions [41/48] xfs: compact deferred intent item structures [42/48] xfs: create slab caches for frequently-used deferred items [43/48] xfs: rename xfs_bmap_add_free to xfs_free_extent_later [44/48] xfs: reduce the size of struct xfs_extent_free_item [45/48] xfs: remove unused parameter from refcount code [46/48] xfs: use swap() to make dabtree code cleaner [47/48] xfs: Fix the free logic of state in xfs_attr_node_hasname [48/48] libxfs: remove kernel stubs from xfs_shared.h

diff --git a/libxfs/init.c b/libxfs/init.c index 155b12fa..4a5b0d2e 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -238,13 +238,13 @@ init_zones(void) sizeof(struct xfs_buf), 0, 0, NULL); xfs_inode_zone = kmem_cache_create("xfs_inode", sizeof(struct xfs_inode), 0, 0, NULL); - xfs_ifork_zone = kmem_cache_create("xfs_ifork", + xfs_ifork_cache = kmem_cache_create("xfs_ifork", sizeof(struct xfs_ifork), 0, 0, NULL); xfs_ili_zone = kmem_cache_create("xfs_inode_log_item", sizeof(struct xfs_inode_log_item), 0, 0, NULL); xfs_buf_item_zone = kmem_cache_create("xfs_buf_log_item", sizeof(struct xfs_buf_log_item), 0, 0, NULL); - xfs_da_state_zone = kmem_cache_create("xfs_da_state", + xfs_da_state_cache = kmem_cache_create("xfs_da_state", sizeof(struct xfs_da_state), 0, 0, NULL); error = xfs_btree_init_cur_caches(); @@ -253,7 +253,7 @@ init_zones(void) abort(); } - xfs_bmap_free_item_zone = kmem_cache_create("xfs_bmap_free_item", + xfs_bmap_free_item_cache = kmem_cache_create("xfs_bmap_free_item", sizeof(struct xfs_extent_free_item), 0, 0, NULL); xfs_trans_zone = kmem_cache_create("xfs_trans", sizeof(struct xfs_trans), 0, 0, NULL); @@ -265,11 +265,11 @@ destroy_kmem_caches(void) kmem_cache_destroy(xfs_buf_zone); kmem_cache_destroy(xfs_ili_zone); kmem_cache_destroy(xfs_inode_zone); - kmem_cache_destroy(xfs_ifork_zone); + kmem_cache_destroy(xfs_ifork_cache); kmem_cache_destroy(xfs_buf_item_zone); - kmem_cache_destroy(xfs_da_state_zone); + kmem_cache_destroy(xfs_da_state_cache); xfs_btree_destroy_cur_caches(); - kmem_cache_destroy(xfs_bmap_free_item_zone); + kmem_cache_destroy(xfs_bmap_free_item_cache); kmem_cache_destroy(xfs_trans_zone); } diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 315e6d1f..c6a2c607 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -1115,11 +1115,11 @@ libxfs_idestroy(xfs_inode_t *ip) } if (ip->i_afp) { libxfs_idestroy_fork(ip->i_afp); - kmem_cache_free(xfs_ifork_zone, ip->i_afp); + kmem_cache_free(xfs_ifork_cache, ip->i_afp); } if (ip->i_cowfp) { libxfs_idestroy_fork(ip->i_cowfp); - kmem_cache_free(xfs_ifork_zone, ip->i_cowfp); + kmem_cache_free(xfs_ifork_cache, ip->i_cowfp); } } diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index c99497fd..06e870a8 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -23,7 +23,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; @@ -2455,10 +2455,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; diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c index 76a52573..31eddb54 100644 --- a/libxfs/xfs_attr_leaf.c +++ b/libxfs/xfs_attr_leaf.c @@ -767,7 +767,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); diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index ecf79e24..0514d6e5 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -31,7 +31,7 @@ #include "xfs_refcount.h" -struct kmem_cache *xfs_bmap_free_item_zone; +struct kmem_cache *xfs_bmap_free_item_cache; /* * Miscellaneous helper functions @@ -548,9 +548,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; diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h index 171a72ee..2cd7717c 100644 --- a/libxfs/xfs_bmap.h +++ b/libxfs/xfs_bmap.h @@ -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. diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c index f1ae5d4d..50f3ec66 100644 --- a/libxfs/xfs_da_btree.c +++ b/libxfs/xfs_da_btree.c @@ -69,7 +69,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. @@ -81,7 +81,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; @@ -110,7 +110,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) diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h index da845e32..0faf7d9a 100644 --- a/libxfs/xfs_da_btree.h +++ b/libxfs/xfs_da_btree.h @@ -9,7 +9,6 @@ struct xfs_inode; struct xfs_trans; -struct zone; /* * Directory/attribute geometry information. There will be one of these for each @@ -227,6 +226,6 @@ void xfs_da3_node_hdr_from_disk(struct xfs_mount *mp, void xfs_da3_node_hdr_to_disk(struct xfs_mount *mp, struct xfs_da_intnode *to, struct xfs_da3_icnode_hdr *from); -extern struct kmem_cache *xfs_da_state_zone; +extern struct kmem_cache *xfs_da_state_cache; #endif /* __XFS_DA_BTREE_H__ */ diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c index c80b4066..d6ac13ee 100644 --- a/libxfs/xfs_inode_fork.c +++ b/libxfs/xfs_inode_fork.c @@ -24,7 +24,7 @@ #include "xfs_types.h" #include "xfs_errortag.h" -struct kmem_cache *xfs_ifork_zone; +struct kmem_cache *xfs_ifork_cache; void xfs_init_local_fork( @@ -282,7 +282,7 @@ xfs_ifork_alloc( { struct xfs_ifork *ifp; - ifp = kmem_cache_zalloc(xfs_ifork_zone, GFP_NOFS | __GFP_NOFAIL); + ifp = kmem_cache_zalloc(xfs_ifork_cache, GFP_NOFS | __GFP_NOFAIL); ifp->if_format = format; ifp->if_nextents = nextents; return ifp; @@ -323,7 +323,7 @@ xfs_iformat_attr_fork( } if (error) { - kmem_cache_free(xfs_ifork_zone, ip->i_afp); + kmem_cache_free(xfs_ifork_cache, ip->i_afp); ip->i_afp = NULL; } return error; @@ -674,7 +674,7 @@ xfs_ifork_init_cow( if (ip->i_cowfp) return; - ip->i_cowfp = kmem_cache_zalloc(xfs_ifork_zone, + ip->i_cowfp = kmem_cache_zalloc(xfs_ifork_cache, GFP_NOFS | __GFP_NOFAIL); ip->i_cowfp->if_format = XFS_DINODE_FMT_EXTENTS; } diff --git a/libxfs/xfs_inode_fork.h b/libxfs/xfs_inode_fork.h index cb296bd5..3d64a3ac 100644 --- a/libxfs/xfs_inode_fork.h +++ b/libxfs/xfs_inode_fork.h @@ -221,7 +221,7 @@ static inline bool xfs_iext_peek_prev_extent(struct xfs_ifork *ifp, xfs_iext_get_extent((ifp), (ext), (got)); \ xfs_iext_next((ifp), (ext))) -extern struct kmem_cache *xfs_ifork_zone; +extern struct kmem_cache *xfs_ifork_cache; extern void xfs_ifork_init_cow(struct xfs_inode *ip);

[38/48] xfs: rename _zone variables to _cache

Commit Message

Patch