Commit 377bcd5f authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong

xfs: Remove kmem_zone_free() wrapper

We can remove it now, without needing to rework the KM_ flags.

Use kmem_cache_free() directly.
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent aaf54eb8
...@@ -81,12 +81,6 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags) ...@@ -81,12 +81,6 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
#define kmem_zone kmem_cache #define kmem_zone kmem_cache
#define kmem_zone_t struct kmem_cache #define kmem_zone_t struct kmem_cache
static inline void
kmem_zone_free(kmem_zone_t *zone, void *ptr)
{
kmem_cache_free(zone, ptr);
}
extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t); extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t);
static inline void * static inline void *
......
...@@ -382,7 +382,7 @@ xfs_btree_del_cursor( ...@@ -382,7 +382,7 @@ xfs_btree_del_cursor(
/* /*
* Free the cursor. * Free the cursor.
*/ */
kmem_zone_free(xfs_btree_cur_zone, cur); kmem_cache_free(xfs_btree_cur_zone, cur);
} }
/* /*
......
...@@ -107,7 +107,7 @@ xfs_da_state_free(xfs_da_state_t *state) ...@@ -107,7 +107,7 @@ xfs_da_state_free(xfs_da_state_t *state)
#ifdef DEBUG #ifdef DEBUG
memset((char *)state, 0, sizeof(*state)); memset((char *)state, 0, sizeof(*state));
#endif /* DEBUG */ #endif /* DEBUG */
kmem_zone_free(xfs_da_state_zone, state); kmem_cache_free(xfs_da_state_zone, state);
} }
void void
......
...@@ -120,10 +120,10 @@ xfs_iformat_fork( ...@@ -120,10 +120,10 @@ xfs_iformat_fork(
break; break;
} }
if (error) { if (error) {
kmem_zone_free(xfs_ifork_zone, ip->i_afp); kmem_cache_free(xfs_ifork_zone, ip->i_afp);
ip->i_afp = NULL; ip->i_afp = NULL;
if (ip->i_cowfp) if (ip->i_cowfp)
kmem_zone_free(xfs_ifork_zone, ip->i_cowfp); kmem_cache_free(xfs_ifork_zone, ip->i_cowfp);
ip->i_cowfp = NULL; ip->i_cowfp = NULL;
xfs_idestroy_fork(ip, XFS_DATA_FORK); xfs_idestroy_fork(ip, XFS_DATA_FORK);
} }
...@@ -531,10 +531,10 @@ xfs_idestroy_fork( ...@@ -531,10 +531,10 @@ xfs_idestroy_fork(
} }
if (whichfork == XFS_ATTR_FORK) { if (whichfork == XFS_ATTR_FORK) {
kmem_zone_free(xfs_ifork_zone, ip->i_afp); kmem_cache_free(xfs_ifork_zone, ip->i_afp);
ip->i_afp = NULL; ip->i_afp = NULL;
} else if (whichfork == XFS_COW_FORK) { } else if (whichfork == XFS_COW_FORK) {
kmem_zone_free(xfs_ifork_zone, ip->i_cowfp); kmem_cache_free(xfs_ifork_zone, ip->i_cowfp);
ip->i_cowfp = NULL; ip->i_cowfp = NULL;
} }
} }
......
...@@ -35,7 +35,7 @@ void ...@@ -35,7 +35,7 @@ void
xfs_bui_item_free( xfs_bui_item_free(
struct xfs_bui_log_item *buip) struct xfs_bui_log_item *buip)
{ {
kmem_zone_free(xfs_bui_zone, buip); kmem_cache_free(xfs_bui_zone, buip);
} }
/* /*
...@@ -201,7 +201,7 @@ xfs_bud_item_release( ...@@ -201,7 +201,7 @@ xfs_bud_item_release(
struct xfs_bud_log_item *budp = BUD_ITEM(lip); struct xfs_bud_log_item *budp = BUD_ITEM(lip);
xfs_bui_release(budp->bud_buip); xfs_bui_release(budp->bud_buip);
kmem_zone_free(xfs_bud_zone, budp); kmem_cache_free(xfs_bud_zone, budp);
} }
static const struct xfs_item_ops xfs_bud_item_ops = { static const struct xfs_item_ops xfs_bud_item_ops = {
......
...@@ -238,7 +238,7 @@ _xfs_buf_alloc( ...@@ -238,7 +238,7 @@ _xfs_buf_alloc(
*/ */
error = xfs_buf_get_maps(bp, nmaps); error = xfs_buf_get_maps(bp, nmaps);
if (error) { if (error) {
kmem_zone_free(xfs_buf_zone, bp); kmem_cache_free(xfs_buf_zone, bp);
return NULL; return NULL;
} }
...@@ -328,7 +328,7 @@ xfs_buf_free( ...@@ -328,7 +328,7 @@ xfs_buf_free(
kmem_free(bp->b_addr); kmem_free(bp->b_addr);
_xfs_buf_free_pages(bp); _xfs_buf_free_pages(bp);
xfs_buf_free_maps(bp); xfs_buf_free_maps(bp);
kmem_zone_free(xfs_buf_zone, bp); kmem_cache_free(xfs_buf_zone, bp);
} }
/* /*
...@@ -949,7 +949,7 @@ xfs_buf_get_uncached( ...@@ -949,7 +949,7 @@ xfs_buf_get_uncached(
_xfs_buf_free_pages(bp); _xfs_buf_free_pages(bp);
fail_free_buf: fail_free_buf:
xfs_buf_free_maps(bp); xfs_buf_free_maps(bp);
kmem_zone_free(xfs_buf_zone, bp); kmem_cache_free(xfs_buf_zone, bp);
fail: fail:
return NULL; return NULL;
} }
......
...@@ -763,7 +763,7 @@ xfs_buf_item_init( ...@@ -763,7 +763,7 @@ xfs_buf_item_init(
error = xfs_buf_item_get_format(bip, bp->b_map_count); error = xfs_buf_item_get_format(bip, bp->b_map_count);
ASSERT(error == 0); ASSERT(error == 0);
if (error) { /* to stop gcc throwing set-but-unused warnings */ if (error) { /* to stop gcc throwing set-but-unused warnings */
kmem_zone_free(xfs_buf_item_zone, bip); kmem_cache_free(xfs_buf_item_zone, bip);
return error; return error;
} }
...@@ -939,7 +939,7 @@ xfs_buf_item_free( ...@@ -939,7 +939,7 @@ xfs_buf_item_free(
{ {
xfs_buf_item_free_format(bip); xfs_buf_item_free_format(bip);
kmem_free(bip->bli_item.li_lv_shadow); kmem_free(bip->bli_item.li_lv_shadow);
kmem_zone_free(xfs_buf_item_zone, bip); kmem_cache_free(xfs_buf_item_zone, bip);
} }
/* /*
......
...@@ -56,7 +56,7 @@ xfs_qm_dqdestroy( ...@@ -56,7 +56,7 @@ xfs_qm_dqdestroy(
mutex_destroy(&dqp->q_qlock); mutex_destroy(&dqp->q_qlock);
XFS_STATS_DEC(dqp->q_mount, xs_qm_dquot); XFS_STATS_DEC(dqp->q_mount, xs_qm_dquot);
kmem_zone_free(xfs_qm_dqzone, dqp); kmem_cache_free(xfs_qm_dqzone, dqp);
} }
/* /*
......
...@@ -39,7 +39,7 @@ xfs_efi_item_free( ...@@ -39,7 +39,7 @@ xfs_efi_item_free(
if (efip->efi_format.efi_nextents > XFS_EFI_MAX_FAST_EXTENTS) if (efip->efi_format.efi_nextents > XFS_EFI_MAX_FAST_EXTENTS)
kmem_free(efip); kmem_free(efip);
else else
kmem_zone_free(xfs_efi_zone, efip); kmem_cache_free(xfs_efi_zone, efip);
} }
/* /*
...@@ -244,7 +244,7 @@ xfs_efd_item_free(struct xfs_efd_log_item *efdp) ...@@ -244,7 +244,7 @@ xfs_efd_item_free(struct xfs_efd_log_item *efdp)
if (efdp->efd_format.efd_nextents > XFS_EFD_MAX_FAST_EXTENTS) if (efdp->efd_format.efd_nextents > XFS_EFD_MAX_FAST_EXTENTS)
kmem_free(efdp); kmem_free(efdp);
else else
kmem_zone_free(xfs_efd_zone, efdp); kmem_cache_free(xfs_efd_zone, efdp);
} }
/* /*
......
...@@ -44,7 +44,7 @@ xfs_inode_alloc( ...@@ -44,7 +44,7 @@ xfs_inode_alloc(
if (!ip) if (!ip)
return NULL; return NULL;
if (inode_init_always(mp->m_super, VFS_I(ip))) { if (inode_init_always(mp->m_super, VFS_I(ip))) {
kmem_zone_free(xfs_inode_zone, ip); kmem_cache_free(xfs_inode_zone, ip);
return NULL; return NULL;
} }
...@@ -104,7 +104,7 @@ xfs_inode_free_callback( ...@@ -104,7 +104,7 @@ xfs_inode_free_callback(
ip->i_itemp = NULL; ip->i_itemp = NULL;
} }
kmem_zone_free(xfs_inode_zone, ip); kmem_cache_free(xfs_inode_zone, ip);
} }
static void static void
......
...@@ -55,7 +55,7 @@ STATIC void ...@@ -55,7 +55,7 @@ STATIC void
xfs_icreate_item_release( xfs_icreate_item_release(
struct xfs_log_item *lip) struct xfs_log_item *lip)
{ {
kmem_zone_free(xfs_icreate_zone, ICR_ITEM(lip)); kmem_cache_free(xfs_icreate_zone, ICR_ITEM(lip));
} }
static const struct xfs_item_ops xfs_icreate_item_ops = { static const struct xfs_item_ops xfs_icreate_item_ops = {
......
...@@ -667,7 +667,7 @@ xfs_inode_item_destroy( ...@@ -667,7 +667,7 @@ xfs_inode_item_destroy(
xfs_inode_t *ip) xfs_inode_t *ip)
{ {
kmem_free(ip->i_itemp->ili_item.li_lv_shadow); kmem_free(ip->i_itemp->ili_item.li_lv_shadow);
kmem_zone_free(xfs_ili_zone, ip->i_itemp); kmem_cache_free(xfs_ili_zone, ip->i_itemp);
} }
......
...@@ -3468,7 +3468,7 @@ xfs_log_ticket_put( ...@@ -3468,7 +3468,7 @@ xfs_log_ticket_put(
{ {
ASSERT(atomic_read(&ticket->t_ref) > 0); ASSERT(atomic_read(&ticket->t_ref) > 0);
if (atomic_dec_and_test(&ticket->t_ref)) if (atomic_dec_and_test(&ticket->t_ref))
kmem_zone_free(xfs_log_ticket_zone, ticket); kmem_cache_free(xfs_log_ticket_zone, ticket);
} }
xlog_ticket_t * xlog_ticket_t *
......
...@@ -34,7 +34,7 @@ xfs_cui_item_free( ...@@ -34,7 +34,7 @@ xfs_cui_item_free(
if (cuip->cui_format.cui_nextents > XFS_CUI_MAX_FAST_EXTENTS) if (cuip->cui_format.cui_nextents > XFS_CUI_MAX_FAST_EXTENTS)
kmem_free(cuip); kmem_free(cuip);
else else
kmem_zone_free(xfs_cui_zone, cuip); kmem_cache_free(xfs_cui_zone, cuip);
} }
/* /*
...@@ -206,7 +206,7 @@ xfs_cud_item_release( ...@@ -206,7 +206,7 @@ xfs_cud_item_release(
struct xfs_cud_log_item *cudp = CUD_ITEM(lip); struct xfs_cud_log_item *cudp = CUD_ITEM(lip);
xfs_cui_release(cudp->cud_cuip); xfs_cui_release(cudp->cud_cuip);
kmem_zone_free(xfs_cud_zone, cudp); kmem_cache_free(xfs_cud_zone, cudp);
} }
static const struct xfs_item_ops xfs_cud_item_ops = { static const struct xfs_item_ops xfs_cud_item_ops = {
......
...@@ -34,7 +34,7 @@ xfs_rui_item_free( ...@@ -34,7 +34,7 @@ xfs_rui_item_free(
if (ruip->rui_format.rui_nextents > XFS_RUI_MAX_FAST_EXTENTS) if (ruip->rui_format.rui_nextents > XFS_RUI_MAX_FAST_EXTENTS)
kmem_free(ruip); kmem_free(ruip);
else else
kmem_zone_free(xfs_rui_zone, ruip); kmem_cache_free(xfs_rui_zone, ruip);
} }
/* /*
...@@ -229,7 +229,7 @@ xfs_rud_item_release( ...@@ -229,7 +229,7 @@ xfs_rud_item_release(
struct xfs_rud_log_item *rudp = RUD_ITEM(lip); struct xfs_rud_log_item *rudp = RUD_ITEM(lip);
xfs_rui_release(rudp->rud_ruip); xfs_rui_release(rudp->rud_ruip);
kmem_zone_free(xfs_rud_zone, rudp); kmem_cache_free(xfs_rud_zone, rudp);
} }
static const struct xfs_item_ops xfs_rud_item_ops = { static const struct xfs_item_ops xfs_rud_item_ops = {
......
...@@ -71,7 +71,7 @@ xfs_trans_free( ...@@ -71,7 +71,7 @@ xfs_trans_free(
if (!(tp->t_flags & XFS_TRANS_NO_WRITECOUNT)) if (!(tp->t_flags & XFS_TRANS_NO_WRITECOUNT))
sb_end_intwrite(tp->t_mountp->m_super); sb_end_intwrite(tp->t_mountp->m_super);
xfs_trans_free_dqinfo(tp); xfs_trans_free_dqinfo(tp);
kmem_zone_free(xfs_trans_zone, tp); kmem_cache_free(xfs_trans_zone, tp);
} }
/* /*
......
...@@ -872,6 +872,6 @@ xfs_trans_free_dqinfo( ...@@ -872,6 +872,6 @@ xfs_trans_free_dqinfo(
{ {
if (!tp->t_dqinfo) if (!tp->t_dqinfo)
return; return;
kmem_zone_free(xfs_qm_dqtrxzone, tp->t_dqinfo); kmem_cache_free(xfs_qm_dqtrxzone, tp->t_dqinfo);
tp->t_dqinfo = NULL; tp->t_dqinfo = NULL;
} }
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