xfs: Remove kmem_zone_free() wrapper

Source kernel commit: 377bcd5f3b7f46f50fdad1fed639c07f8c9f68cb

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/kmem.h b/include/kmem.h
index 0f48dc686d07fc3011f3e14f50fa4584c12be045..05ae354a87cd2a7fcb97ebc8a1e2d6eaf5db3b5d 100644 (file)
--- a/include/kmem.h
+++ b/include/kmem.h
@@ -22,7 +22,7 @@ extern void   *kmem_zone_zalloc(kmem_zone_t *, int);
 extern int     kmem_zone_destroy(kmem_zone_t *);
 
 static inline void
-kmem_zone_free(kmem_zone_t *zone, void *ptr)
+kmem_cache_free(kmem_zone_t *zone, void *ptr)
 {
        zone->allocated--;
        free(ptr);

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 3f69192d05e9597c624c02600b7623e8f101fdb1..0d9d72022ec3660720af0ac6cfa7885fb8b7df86 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1270,7 +1270,7 @@ libxfs_bcache_free(void)
                free(bp->b_addr);
                if (bp->b_maps != &bp->__b_map)
                        free(bp->b_maps);
-               kmem_zone_free(xfs_buf_zone, bp);
+               kmem_cache_free(xfs_buf_zone, bp);
        }
 }
 
@@ -1426,7 +1426,7 @@ libxfs_iget(
        ip->i_mount = mp;
        error = xfs_iread(mp, tp, ip, 0);
        if (error) {
-               kmem_zone_free(xfs_inode_zone, ip);
+               kmem_cache_free(xfs_inode_zone, ip);
                *ipp = NULL;
                return error;
        }
@@ -1471,7 +1471,7 @@ libxfs_irele(
 {
        ASSERT(ip->i_itemp == NULL);
        libxfs_idestroy(ip);
-       kmem_zone_free(xfs_inode_zone, ip);
+       kmem_cache_free(xfs_inode_zone, ip);
 }
 
 /*

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 42c2e9e19e5a7bbfb917b32dc53f15f371635552..18b87d705ccae5c7525af94fd572e78eb11b0772 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -124,7 +124,7 @@ static void
 xfs_trans_free(
        struct xfs_trans        *tp)
 {
-       kmem_zone_free(xfs_trans_zone, tp);
+       kmem_cache_free(xfs_trans_zone, tp);
 }
 
 /*
@@ -336,7 +336,7 @@ xfs_buf_item_put(
        struct xfs_buf          *bp = bip->bli_buf;
 
        bp->b_log_item = NULL;
-       kmem_zone_free(xfs_buf_item_zone, bip);
+       kmem_cache_free(xfs_buf_item_zone, bip);
 }
 
 /* from xfs_trans_buf.c */
@@ -791,7 +791,7 @@ xfs_inode_item_put(
        struct xfs_inode                *ip = iip->ili_inode;
 
        ip->i_itemp = NULL;
-       kmem_zone_free(xfs_ili_zone, iip);
+       kmem_cache_free(xfs_ili_zone, iip);
 }
 
 

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 9ebf1fb37ac624c56fa02c2516ba3b9717b5df70..08a7e4eba3a76f73591ce71b4edb4fc8bec5a31d 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -377,7 +377,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/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 5907c8c40d69eae03f32d6333e9a8770bf8b8f50..1cf556058e11639bb6f31986afc8a18d8d363797 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -104,7 +104,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/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index 1d726650f429636b79eac8b9b1c1d47d73cfc544..a4b5686e041dfe0b807eecd994e8423f60ac9951 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -118,10 +118,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);
        }
@@ -529,10 +529,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;
        }
 }