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: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
index 70ed74c7f37e75b8e50ea787de6b93fef3f77e26..6143117770e93abe81f0ddba24a02a1aa85af38a 100644 (file)
--- a/fs/xfs/kmem.h
+++ b/fs/xfs/kmem.h
@@ -81,12 +81,6 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
 #define kmem_zone      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);
 
 static inline void *

diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 8f0e3a368f38b97b04f34df748a2f2365e48cd2d..e2cc98931552949bc708095ce24f4e259070c462 100644 (file)
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -382,7 +382,7 @@ xfs_btree_del_cursor(
        /*
         * Free the cursor.
         */
-       kmem_zone_free(xfs_btree_cur_zone, cur);
+       kmem_cache_free(xfs_btree_cur_zone, cur);
 }
 
 /*

diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index e424b004e3cbb05ab79fab71854e019f44b7d2c4..272db30947e5d046067b250190b74dc72de60c00 100644 (file)
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -107,7 +107,7 @@ xfs_da_state_free(xfs_da_state_t *state)
 #ifdef DEBUG
        memset((char *)state, 0, sizeof(*state));
 #endif /* DEBUG */
-       kmem_zone_free(xfs_da_state_zone, state);
+       kmem_cache_free(xfs_da_state_zone, state);
 }
 
 void

diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 15d6f947620ffdba5c015d948d5a10431f6d499a..ad2b9c313fd25e61041e1497e71da04da5580040 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -120,10 +120,10 @@ xfs_iformat_fork(
                break;
        }
        if (error) {
-               kmem_zone_free(xfs_ifork_zone, ip->i_afp);
+               kmem_cache_free(xfs_ifork_zone, ip->i_afp);
                ip->i_afp = NULL;
                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;
                xfs_idestroy_fork(ip, XFS_DATA_FORK);
        }
@@ -531,10 +531,10 @@ xfs_idestroy_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;
        } 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;
        }
 }

diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index 243e5e0f82a3094cc1f4adf386be0a0afd6b3e9c..ee6f4229cebc476da27e1925d4ced3a9c411ead9 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -35,7 +35,7 @@ void
 xfs_bui_item_free(
        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(
        struct xfs_bud_log_item *budp = BUD_ITEM(lip);
 
        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 = {

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index ccccfb792ff8ce492f4c51d0edca7b10fc7e6208..a0229c368e789e5b8e7e8607d9b932e7d9e05446 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -238,7 +238,7 @@ _xfs_buf_alloc(
         */
        error = xfs_buf_get_maps(bp, nmaps);
        if (error)  {
-               kmem_zone_free(xfs_buf_zone, bp);
+               kmem_cache_free(xfs_buf_zone, bp);
                return NULL;
        }
 
@@ -328,7 +328,7 @@ xfs_buf_free(
                kmem_free(bp->b_addr);
        _xfs_buf_free_pages(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(
        _xfs_buf_free_pages(bp);
  fail_free_buf:
        xfs_buf_free_maps(bp);
-       kmem_zone_free(xfs_buf_zone, bp);
+       kmem_cache_free(xfs_buf_zone, bp);
  fail:
        return NULL;
 }

diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 6b69e6137b2ba3c711158a6937fc6c20b594a67a..3458a1264a3f6d0d05ae48130ddfc44d2985b784 100644 (file)
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -763,7 +763,7 @@ xfs_buf_item_init(
        error = xfs_buf_item_get_format(bip, bp->b_map_count);
        ASSERT(error == 0);
        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;
        }
 
@@ -939,7 +939,7 @@ xfs_buf_item_free(
 {
        xfs_buf_item_free_format(bip);
        kmem_free(bip->bli_item.li_lv_shadow);
-       kmem_zone_free(xfs_buf_item_zone, bip);
+       kmem_cache_free(xfs_buf_item_zone, bip);
 }
 
 /*

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index e980e736bde2308297d5a5e81d598095b2b727a0..2bff21ca9d78d859ba048e1676f2d71084787829 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -56,7 +56,7 @@ xfs_qm_dqdestroy(
        mutex_destroy(&dqp->q_qlock);
 
        XFS_STATS_DEC(dqp->q_mount, xs_qm_dquot);
-       kmem_zone_free(xfs_qm_dqzone, dqp);
+       kmem_cache_free(xfs_qm_dqzone, dqp);
 }
 
 /*

diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index a05a1074e8f81e50823536537886c114964b6e39..6ea847f6e29804c1d90d780fe0c3086a282e426c 100644 (file)
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -39,7 +39,7 @@ xfs_efi_item_free(
        if (efip->efi_format.efi_nextents > XFS_EFI_MAX_FAST_EXTENTS)
                kmem_free(efip);
        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)
        if (efdp->efd_format.efd_nextents > XFS_EFD_MAX_FAST_EXTENTS)
                kmem_free(efdp);
        else
-               kmem_zone_free(xfs_efd_zone, efdp);
+               kmem_cache_free(xfs_efd_zone, efdp);
 }
 
 /*

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index ec302b7e48f39d201007bdce20e11ae67dbc0ef3..8dc2e54142768c29fd438b37dce733f02ccae949 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -44,7 +44,7 @@ xfs_inode_alloc(
        if (!ip)
                return NULL;
        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;
        }
 
@@ -104,7 +104,7 @@ xfs_inode_free_callback(
                ip->i_itemp = NULL;
        }
 
-       kmem_zone_free(xfs_inode_zone, ip);
+       kmem_cache_free(xfs_inode_zone, ip);
 }
 
 static void

diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c
index 3ebd1b7f49d824f133ec8f7ffaac7e945742f615..490fee22b878222a0869f2805daf44b399470fce 100644 (file)
--- a/fs/xfs/xfs_icreate_item.c
+++ b/fs/xfs/xfs_icreate_item.c
@@ -55,7 +55,7 @@ STATIC void
 xfs_icreate_item_release(
        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 = {

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 07f2b57feecbf3cb5971647c43a97a7c8a6affee..8bd5d0de6321e8fa4d790a0febcf11852e4d9c33 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -667,7 +667,7 @@ xfs_inode_item_destroy(
        xfs_inode_t     *ip)
 {
        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);
 }
 
 

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 3806674090ed4b37cc96b64cf81b15d24267eefa..6a147c63a8a6d02fa4dcc292efa4067dfe0447d7 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3468,7 +3468,7 @@ xfs_log_ticket_put(
 {
        ASSERT(atomic_read(&ticket->t_ref) > 0);
        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 *

diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index d5708d40ad877248b69670b36753d587b0fce1be..8eeed73928cdfac81f7800d9dd92026577b1c98d 100644 (file)
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -34,7 +34,7 @@ xfs_cui_item_free(
        if (cuip->cui_format.cui_nextents > XFS_CUI_MAX_FAST_EXTENTS)
                kmem_free(cuip);
        else
-               kmem_zone_free(xfs_cui_zone, cuip);
+               kmem_cache_free(xfs_cui_zone, cuip);
 }
 
 /*
@@ -206,7 +206,7 @@ xfs_cud_item_release(
        struct xfs_cud_log_item *cudp = CUD_ITEM(lip);
 
        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 = {

diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
index 02f84d9a511c3712b764ad67a94103eb288380ac..4911b68f95dda2e50f96be91ef38335514a44b6c 100644 (file)
--- a/fs/xfs/xfs_rmap_item.c
+++ b/fs/xfs/xfs_rmap_item.c
@@ -34,7 +34,7 @@ xfs_rui_item_free(
        if (ruip->rui_format.rui_nextents > XFS_RUI_MAX_FAST_EXTENTS)
                kmem_free(ruip);
        else
-               kmem_zone_free(xfs_rui_zone, ruip);
+               kmem_cache_free(xfs_rui_zone, ruip);
 }
 
 /*
@@ -229,7 +229,7 @@ xfs_rud_item_release(
        struct xfs_rud_log_item *rudp = RUD_ITEM(lip);
 
        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 = {

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index f4795fdb7389c02266fdcdce071e36bcd99141e9..3b208f9a865cb8275cb3230f31cb8f7f44328759 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -71,7 +71,7 @@ xfs_trans_free(
        if (!(tp->t_flags & XFS_TRANS_NO_WRITECOUNT))
                sb_end_intwrite(tp->t_mountp->m_super);
        xfs_trans_free_dqinfo(tp);
-       kmem_zone_free(xfs_trans_zone, tp);
+       kmem_cache_free(xfs_trans_zone, tp);
 }
 
 /*

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 454fc83c588ad90c129d1b55e98bdba840d44dd4..a6fe2d8dc40f38307f643360a84c80e5eaa6360b 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -872,6 +872,6 @@ xfs_trans_free_dqinfo(
 {
        if (!tp->t_dqinfo)
                return;
-       kmem_zone_free(xfs_qm_dqtrxzone, tp->t_dqinfo);
+       kmem_cache_free(xfs_qm_dqtrxzone, tp->t_dqinfo);
        tp->t_dqinfo = NULL;
 }