[XFS] Small ktrace fixes

SGI Modid: xfs-linux:xfs-kern:164115a

diff --git a/fs/xfs/linux/xfs_buf.c b/fs/xfs/linux/xfs_buf.c
index 891fa4447f368e9ac7214c22c8db3c63a1ac0f15..b575fbbae7095fc627d7241f9711cd25540b0019 100644 (file)
--- a/fs/xfs/linux/xfs_buf.c
+++ b/fs/xfs/linux/xfs_buf.c
@@ -2091,6 +2091,10 @@ pagebuf_terminate(void)
 {
        pagebuf_daemon_stop();
 
+#ifdef PAGEBUF_TRACE
+       ktrace_free(pagebuf_trace_buf);
+#endif
+
        kmem_cache_destroy(pagebuf_cache);
 
        unregister_sysctl_table(pagebuf_table_header);

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 229674c01bf887727667ac7273fa8fc1dd1f373b..088cb2321ee227fe7b28ad97a9be0111829ce873 100644 (file)
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -106,12 +106,11 @@ STATIC int xfs_attr_rmtval_remove(xfs_da_args_t *args);
 #define ATTR_RMTVALUE_MAPSIZE  1       /* # of map entries at once */
 #define ATTR_RMTVALUE_TRANSBLKS        8       /* max # of blks in a transaction */
 
-#if defined(DEBUG)
+#if defined(XFS_ATTR_TRACE)
 ktrace_t *xfs_attr_trace_buf;
 #endif
 
 
-
 /*========================================================================
  * Overall external interface routines.
  *========================================================================*/

diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c
index 44cfa392eab1b0cde62d283f22a7548b7b06354d..788e80064936122cd5dbf0b62daa673c523577fd 100644 (file)
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
@@ -61,7 +61,7 @@
 #include "xfs_error.h"
 #include "xfs_quota.h"
 
-#ifdef DEBUG
+#if defined(XFS_BMBT_TRACE)
 ktrace_t       *xfs_bmbt_trace_buf;
 #endif
 

diff --git a/fs/xfs/xfs_dir.c b/fs/xfs/xfs_dir.c
index 5e4ad55f3c244b4c1897b5d18fa8ef8262b38cb8..3ea04f9ac2310b321610aa6b4e0786f8b2cf9177 100644 (file)
--- a/fs/xfs/xfs_dir.c
+++ b/fs/xfs/xfs_dir.c
@@ -162,7 +162,7 @@ STATIC int xfs_dir_node_getdents(xfs_trans_t *trans, xfs_inode_t *dp,
                                             xfs_dir_put_t put);
 STATIC int xfs_dir_node_replace(xfs_da_args_t *args);
 
-#if defined(DEBUG)
+#if defined(XFS_DIR_TRACE)
 ktrace_t *xfs_dir_trace_buf;
 #endif
 

diff --git a/fs/xfs/xfs_dir2_trace.c b/fs/xfs/xfs_dir2_trace.c
index 41b87fa14945212b96958f6185a06990e43df746..c6747162f251839c61e09e9d2605bb15c83acec2 100644 (file)
--- a/fs/xfs/xfs_dir2_trace.c
+++ b/fs/xfs/xfs_dir2_trace.c
@@ -49,11 +49,9 @@
 #include "xfs_da_btree.h"
 #include "xfs_dir2_trace.h"
 
-#ifdef DEBUG
+#ifdef XFS_DIR2_TRACE
 ktrace_t       *xfs_dir2_trace_buf;
-#endif /* DEBUG */
 
-#ifdef XFS_DIR2_TRACE
 /*
  * Enter something in the trace buffers.
  */

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 4bae0b60977e18ddb599749a15451d9b2c8d673c..2ecd9b3dc74d3a7620ee5e8b6b35720b867b605a 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -171,6 +171,25 @@ xfs_cleanup(void)
        xfs_sysctl_unregister();
        xfs_refcache_destroy();
 
+#ifdef XFS_DIR2_TRACE
+       ktrace_free(xfs_dir2_trace_buf);
+#endif
+#ifdef XFS_ATTR_TRACE
+       ktrace_free(xfs_attr_trace_buf);
+#endif
+#ifdef XFS_DIR_TRACE
+       ktrace_free(xfs_dir_trace_buf);
+#endif
+#ifdef XFS_BMBT_TRACE
+       ktrace_free(xfs_bmbt_trace_buf);
+#endif
+#ifdef XFS_BMAP_TRACE
+       ktrace_free(xfs_bmap_trace_buf);
+#endif
+#ifdef XFS_ALLOC_TRACE
+       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);