[XFS] Fixup naming inconsistencies found by Pekka Enberg and one from Jan

Engelhardt.

SGI-PV: 947038
SGI-Modid: xfs-linux-melb:xfs-kern:25529a

Signed-off-by: Nathan Scott <nathans@sgi.com>

4 files changed, 20 insertions, 20 deletions

diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c
index 90402a1c3983..6838b36d95a9 100644
--- a/fs/xfs/quota/xfs_qm_bhv.c
+++ b/fs/xfs/quota/xfs_qm_bhv.c
@@ -374,7 +374,7 @@ xfs_qm_exit(void)
         vfs_bhv_clr_custom(&xfs_qmops);
         xfs_qm_cleanup_procfs();
         if (qm_dqzone)
-                kmem_cache_destroy(qm_dqzone);
+                kmem_zone_destroy(qm_dqzone);
         if (qm_dqtrxzone)
-                kmem_cache_destroy(qm_dqtrxzone);
+                kmem_zone_destroy(qm_dqtrxzone);
 }
diff --git a/fs/xfs/support/ktrace.c b/fs/xfs/support/ktrace.c
index 841aa4c15b8a..addf5a7ea06c 100644
--- a/fs/xfs/support/ktrace.c
+++ b/fs/xfs/support/ktrace.c
@@ -39,8 +39,8 @@ ktrace_init(int zentries)
 void
 ktrace_uninit(void)
 {
-        kmem_cache_destroy(ktrace_hdr_zone);
-        kmem_cache_destroy(ktrace_ent_zone);
+        kmem_zone_destroy(ktrace_hdr_zone);
+        kmem_zone_destroy(ktrace_ent_zone);
 }
 
 /*
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
index f9315bc960cb..538d0d65b04c 100644
--- a/fs/xfs/xfs_acl.h
+++ b/fs/xfs/xfs_acl.h
@@ -55,8 +55,8 @@ struct xfs_inode;
 
 extern struct kmem_zone *xfs_acl_zone;
 #define xfs_acl_zone_init(zone, name)   \
-                (zone) = kmem_zone_init(sizeof(xfs_acl_t), name)
-#define xfs_acl_zone_destroy(zone)      kmem_cache_destroy(zone)
+                (zone) = kmem_zone_init(sizeof(xfs_acl_t), (name))
+#define xfs_acl_zone_destroy(zone)      kmem_zone_destroy(zone)
 
 extern int xfs_acl_inherit(struct vnode *, struct vattr *, xfs_acl_t *);
 extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *);
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 811a4261fa2c..c40e5883db43 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -190,18 +190,18 @@ xfs_cleanup(void)
         ktrace_free(xfs_alloc_trace_buf);
 #endif
 
-        kmem_cache_destroy(xfs_bmap_free_item_zone);
-        kmem_cache_destroy(xfs_btree_cur_zone);
-        kmem_cache_destroy(xfs_inode_zone);
-        kmem_cache_destroy(xfs_trans_zone);
-        kmem_cache_destroy(xfs_da_state_zone);
-        kmem_cache_destroy(xfs_dabuf_zone);
-        kmem_cache_destroy(xfs_buf_item_zone);
-        kmem_cache_destroy(xfs_efd_zone);
-        kmem_cache_destroy(xfs_efi_zone);
-        kmem_cache_destroy(xfs_ifork_zone);
-        kmem_cache_destroy(xfs_ili_zone);
-        kmem_cache_destroy(xfs_chashlist_zone);
+        kmem_zone_destroy(xfs_bmap_free_item_zone);
+        kmem_zone_destroy(xfs_btree_cur_zone);
+        kmem_zone_destroy(xfs_inode_zone);
+        kmem_zone_destroy(xfs_trans_zone);
+        kmem_zone_destroy(xfs_da_state_zone);
+        kmem_zone_destroy(xfs_dabuf_zone);
+        kmem_zone_destroy(xfs_buf_item_zone);
+        kmem_zone_destroy(xfs_efd_zone);
+        kmem_zone_destroy(xfs_efi_zone);
+        kmem_zone_destroy(xfs_ifork_zone);
+        kmem_zone_destroy(xfs_ili_zone);
+        kmem_zone_destroy(xfs_chashlist_zone);
 }
 
 /*
@@ -632,7 +632,7 @@ xfs_quiesce_fs(
         xfs_mount_t             *mp)
 {
         int                     count = 0, pincount;
-                
+
         xfs_refcache_purge_mp(mp);
         xfs_flush_buftarg(mp->m_ddev_targp, 0);
         xfs_finish_reclaim_all(mp, 0);
@@ -643,7 +643,7 @@ xfs_quiesce_fs(
          * meta data (typically directory updates).
          * Which then must be flushed and logged before
          * we can write the unmount record.
-         */ 
+         */
         do {
                 xfs_syncsub(mp, SYNC_REMOUNT|SYNC_ATTR|SYNC_WAIT, 0, NULL);
                 pincount = xfs_flush_buftarg(mp->m_ddev_targp, 1);