libxfs: rename all the other _zone variables to _cache

Convert all the other _zone variables that we didn't catch in the libxfs
porting patches.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/libxfs/init.c b/libxfs/init.c
index a2a847fb5d5d3353b7a061a1e204e7370790c0b9..654e475fcd2a1474ebf8761ff6404cde4d98bd89 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -229,20 +229,20 @@ check_open(char *path, int flags, char **rawfile, char **blockfile)
  * Initialize/destroy all of the zone allocators we use.
  */
 static void
-init_zones(void)
+init_caches(void)
 {
        int             error;
 
        /* initialise zone allocation */
-       xfs_buf_zone = kmem_cache_create("xfs_buffer",
+       xfs_buf_cache = kmem_cache_create("xfs_buffer",
                        sizeof(struct xfs_buf), 0, 0, NULL);
-       xfs_inode_zone = kmem_cache_create("xfs_inode",
+       xfs_inode_cache = kmem_cache_create("xfs_inode",
                        sizeof(struct xfs_inode), 0, 0, NULL);
        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",
+       xfs_ili_cache = 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",
+       xfs_buf_item_cache = kmem_cache_create("xfs_buf_log_item",
                        sizeof(struct xfs_buf_log_item), 0, 0, NULL);
        xfs_da_state_cache = kmem_cache_create("xfs_da_state",
                        sizeof(struct xfs_da_state), 0, 0, NULL);
@@ -255,22 +255,22 @@ init_zones(void)
 
        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",
+       xfs_trans_cache = kmem_cache_create("xfs_trans",
                        sizeof(struct xfs_trans), 0, 0, NULL);
 }
 
 static void
 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_buf_cache);
+       kmem_cache_destroy(xfs_ili_cache);
+       kmem_cache_destroy(xfs_inode_cache);
        kmem_cache_destroy(xfs_ifork_cache);
-       kmem_cache_destroy(xfs_buf_item_zone);
+       kmem_cache_destroy(xfs_buf_item_cache);
        kmem_cache_destroy(xfs_da_state_cache);
        xfs_btree_destroy_cur_caches();
        kmem_cache_destroy(xfs_bmap_free_item_cache);
-       kmem_cache_destroy(xfs_trans_zone);
+       kmem_cache_destroy(xfs_trans_cache);
 }
 
 static void
@@ -405,7 +405,7 @@ libxfs_init(libxfs_init_t *a)
                                   &libxfs_bcache_operations);
        use_xfs_buf_lock = a->usebuflock;
        xfs_dir_startup();
-       init_zones();
+       init_caches();
        rval = 1;
 done:
        if (dpath[0])

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 5b04db847812f23dec9f27b54c1e940687e6187d..67d9a8bb1eb74bd845918ecef7ab32461ecdecb2 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -59,11 +59,11 @@
 #include <sys/xattr.h>
 
 /* Zones used in libxfs allocations that aren't in shared header files */
-extern struct kmem_cache *xfs_buf_item_zone;
-extern struct kmem_cache *xfs_ili_zone;
-extern struct kmem_cache *xfs_buf_zone;
-extern struct kmem_cache *xfs_inode_zone;
-extern struct kmem_cache *xfs_trans_zone;
+extern struct kmem_cache *xfs_buf_item_cache;
+extern struct kmem_cache *xfs_ili_cache;
+extern struct kmem_cache *xfs_buf_cache;
+extern struct kmem_cache *xfs_inode_cache;
+extern struct kmem_cache *xfs_trans_cache;
 
 /* fake up iomap, (not) used in xfs_bmap.[ch] */
 #define IOMAP_F_SHARED                 0x04

diff --git a/libxfs/logitem.c b/libxfs/logitem.c
index dde90502cff2d2edca997da76fbe0cbad499c091..98ccdaefb18fed265eac37127f733a10f6f6c5b6 100644 (file)
--- a/libxfs/logitem.c
+++ b/libxfs/logitem.c
@@ -16,8 +16,8 @@
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 
-struct kmem_cache      *xfs_buf_item_zone;
-struct kmem_cache      *xfs_ili_zone;          /* inode log item zone */
+struct kmem_cache      *xfs_buf_item_cache;
+struct kmem_cache      *xfs_ili_cache;         /* inode log item cache */
 
 /*
  * Following functions from fs/xfs/xfs_trans_buf.c
@@ -96,7 +96,7 @@ xfs_buf_item_init(
                }
        }
 
-       bip = kmem_cache_zalloc(xfs_buf_item_zone, 0);
+       bip = kmem_cache_zalloc(xfs_buf_item_cache, 0);
 #ifdef LI_DEBUG
        fprintf(stderr, "adding buf item %p for not-logged buffer %p\n",
                bip, bp);
@@ -138,7 +138,7 @@ xfs_inode_item_init(
        struct xfs_inode_log_item       *iip;
 
        ASSERT(ip->i_itemp == NULL);
-       iip = ip->i_itemp = kmem_cache_zalloc(xfs_ili_zone, 0);
+       iip = ip->i_itemp = kmem_cache_zalloc(xfs_ili_cache, 0);
 #ifdef LI_DEBUG
        fprintf(stderr, "inode_item_init for inode %llu, iip=%p\n",
                ip->i_ino, iip);

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 0b387e23bafa85e07dd7e11b8b589ce61f7be471..c283928b1a7b307cbcaca1188d05a10b269d3165 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -161,7 +161,7 @@ libxfs_getsb(
        return bp;
 }
 
-struct kmem_cache                      *xfs_buf_zone;
+struct kmem_cache                      *xfs_buf_cache;
 
 static struct cache_mru                xfs_buf_freelist =
        {{&xfs_buf_freelist.cm_list, &xfs_buf_freelist.cm_list},
@@ -327,7 +327,7 @@ __libxfs_getbufr(int blen)
                        bp->b_maps = NULL;
                }
        } else
-               bp = kmem_cache_zalloc(xfs_buf_zone, 0);
+               bp = kmem_cache_zalloc(xfs_buf_cache, 0);
        pthread_mutex_unlock(&xfs_buf_freelist.cm_mutex);
        bp->b_ops = NULL;
        if (bp->b_flags & LIBXFS_B_DIRTY)
@@ -964,7 +964,7 @@ libxfs_bcache_free(void)
                free(bp->b_addr);
                if (bp->b_maps != &bp->__b_map)
                        free(bp->b_maps);
-               kmem_cache_free(xfs_buf_zone, bp);
+               kmem_cache_free(xfs_buf_cache, bp);
        }
 }
 
@@ -1056,8 +1056,8 @@ xfs_verify_magic16(
  * Inode cache stubs.
  */
 
-struct kmem_cache              *xfs_inode_zone;
-extern struct kmem_cache       *xfs_ili_zone;
+struct kmem_cache              *xfs_inode_cache;
+extern struct kmem_cache       *xfs_ili_cache;
 
 int
 libxfs_iget(
@@ -1071,7 +1071,7 @@ libxfs_iget(
        struct xfs_buf          *bp;
        int                     error = 0;
 
-       ip = kmem_cache_zalloc(xfs_inode_zone, 0);
+       ip = kmem_cache_zalloc(xfs_inode_cache, 0);
        if (!ip)
                return -ENOMEM;
 
@@ -1101,7 +1101,7 @@ libxfs_iget(
        return 0;
 
 out_destroy:
-       kmem_cache_free(xfs_inode_zone, ip);
+       kmem_cache_free(xfs_inode_cache, ip);
        *ipp = NULL;
        return error;
 }
@@ -1135,7 +1135,7 @@ libxfs_irele(
        if (VFS_I(ip)->i_count == 0) {
                ASSERT(ip->i_itemp == NULL);
                libxfs_idestroy(ip);
-               kmem_cache_free(xfs_inode_zone, ip);
+               kmem_cache_free(xfs_inode_cache, ip);
        }
 }
 

diff --git a/libxfs/trans.c b/libxfs/trans.c
index f87a65c573c920c9e6bbd5e6f4571bc471c0ff99..50d9c23de3e22d370f0a2c0ef19a37c71fd5a18d 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -30,7 +30,7 @@ static int __xfs_trans_commit(struct xfs_trans *tp, bool regrant);
  * Simple transaction interface
  */
 
-struct kmem_cache      *xfs_trans_zone;
+struct kmem_cache      *xfs_trans_cache;
 
 /*
  * Initialize the precomputed transaction reservation values
@@ -124,7 +124,7 @@ static void
 xfs_trans_free(
        struct xfs_trans        *tp)
 {
-       kmem_cache_free(xfs_trans_zone, tp);
+       kmem_cache_free(xfs_trans_cache, tp);
 }
 
 /*
@@ -141,7 +141,7 @@ xfs_trans_dup(
 {
        struct xfs_trans        *ntp;
 
-       ntp = kmem_cache_zalloc(xfs_trans_zone, 0);
+       ntp = kmem_cache_zalloc(xfs_trans_cache, 0);
 
        /*
         * Initialize the new transaction structure.
@@ -259,7 +259,7 @@ libxfs_trans_alloc(
        struct xfs_trans        *tp;
        int                     error;
 
-       tp = kmem_cache_zalloc(xfs_trans_zone, 0);
+       tp = kmem_cache_zalloc(xfs_trans_cache, 0);
        tp->t_mountp = mp;
        INIT_LIST_HEAD(&tp->t_items);
        INIT_LIST_HEAD(&tp->t_dfops);
@@ -354,7 +354,7 @@ xfs_buf_item_put(
        struct xfs_buf          *bp = bip->bli_buf;
 
        bp->b_log_item = NULL;
-       kmem_cache_free(xfs_buf_item_zone, bip);
+       kmem_cache_free(xfs_buf_item_cache, bip);
 }
 
 /* from xfs_trans_buf.c */
@@ -816,7 +816,7 @@ xfs_inode_item_put(
        ip->i_itemp = NULL;
 
        list_del_init(&iip->ili_item.li_bio_list);
-       kmem_cache_free(xfs_ili_zone, iip);
+       kmem_cache_free(xfs_ili_cache, iip);
 }
 
 
@@ -868,7 +868,7 @@ buf_item_done(
 {
        struct xfs_buf          *bp;
        int                     hold;
-       extern struct kmem_cache        *xfs_buf_item_zone;
+       extern struct kmem_cache        *xfs_buf_item_cache;
 
        bp = bip->bli_buf;
        ASSERT(bp != NULL);