[Ocfs2-commits] mfasheh commits r2202 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-04-29 13:37:52 -0500 (Fri, 29 Apr 2005)
New Revision: 2202

Modified:
   trunk/fs/ocfs2/super.c
Log:
* get rid of the old ocfs2 tracing sysctls, they are no longer used.

Signed-off-by: manish



Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c	2005-04-29 18:35:11 UTC (rev 2201)
+++ trunk/fs/ocfs2/super.c	2005-04-29 18:37:52 UTC (rev 2202)
@@ -32,7 +32,6 @@
 #include <linux/highmem.h>
 #include <linux/utsname.h>
 #include <linux/init.h>
-#include <linux/sysctl.h>
 #include <linux/random.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/statfs.h>
@@ -79,88 +78,9 @@
 kmem_cache_t *ocfs2_inode_cache = NULL;
 kmem_cache_t *ocfs2_lock_cache = NULL;
 
-u32 debug_context = 0;
-u32 debug_level = 0;
-u32 debug_exclude = 0;
-
-static ctl_table ocfs_dbg_table[] = {
-	{
-		.ctl_name	= KERN_OCFS2_NM + 1,
-		.procname	= "debug_level",
-		.data		= &debug_level,
-		.maxlen		= sizeof(u32),
-		.mode		= 0644,
-		.child		= NULL,
-		.proc_handler	= &proc_dointvec,
-		.strategy	= &sysctl_intvec,
-	},
-	{
-		.ctl_name	= KERN_OCFS2_NM + 2,
-		.procname	= "debug_context",
-		.data		= &debug_context,
-		.maxlen		= sizeof(u32),
-		.mode		= 0644,
-		.child		= NULL,
-		.proc_handler	= &proc_dointvec,
-		.strategy	= &sysctl_intvec
-	},
-	{
-		.ctl_name	= KERN_OCFS2_NM + 3,
-		.procname	= "debug_exclude",
-		.data		= &debug_exclude,
-		.maxlen		= sizeof(u32),
-		.mode		= 0644,
-		.child		= NULL,
-		.proc_handler	= &proc_dointvec,
-		.strategy	= &sysctl_intvec
-	},
-	{ .ctl_name = 0 }
-};
-
-static ctl_table ocfs_kern_table[] = {
-	{
-		.ctl_name	= KERN_OCFS2,
-		.procname	= "ocfs2",
-		.data		= NULL,
-		.maxlen		= 0,
-		.mode		= 0555,
-		.child		= ocfs_dbg_table
-	},
-	{ .ctl_name = 0} 
-};
-
-static ctl_table ocfs_root_table[] = {
-	{
-		.ctl_name	= CTL_FS,
-		.procname	= "fs",
-		.data		= NULL,
-		.maxlen		= 0,
-		.mode		= 0555,
-		.child		= ocfs_kern_table
-	},
-	{ .ctl_name = 0 }
-};
-static struct ctl_table_header *ocfs_table_header = NULL;
-
-// -disabled for ocfs_show_trace- EXPORT_NO_SYMBOLS;
-
 MODULE_AUTHOR("Oracle");
 MODULE_LICENSE("GPL");
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-module_param(debug_context, uint, 0);
-module_param(debug_level, uint, 0);
-module_param(debug_exclude, uint, 0);
-#else /* 2.6.x kernel */
-MODULE_PARM(debug_context, "i");
-MODULE_PARM(debug_level, "i");
-MODULE_PARM(debug_exclude, "i");
-#endif /* Linux 2.4 stuff */
-
-MODULE_PARM_DESC(debug_context, "Debug context");
-MODULE_PARM_DESC(debug_level, "Debug level");
-MODULE_PARM_DESC(debug_exclude, "Process ID to exclude from tracing");
-
 static void ocfs_put_super(struct super_block *sb);
 static int ocfs_mount_volume(struct super_block *sb);
 static void ocfs_dismount_volume(struct super_block *sb);
@@ -511,13 +431,6 @@
 	if (init_ocfs2_extent_maps())
 		return -ENOMEM;
 
-	ocfs_table_header = register_sysctl_table(ocfs_root_table, 0);
-	if (!ocfs_table_header) {
-		status = -ENOMEM;
-		mlog_errno(status);
-		goto leave;
-	}
-
 	/* Initialize the memory slabs for oin and file entry */
 	status = ocfs_initialize_mem_caches();
 	if (status < 0) {
@@ -535,10 +448,6 @@
 leave:
 	if (status < 0) {
 		ocfs_free_mem_caches();
-
-		if (ocfs_table_header)
-			unregister_sysctl_table(ocfs_table_header);
-
 		exit_ocfs2_extent_maps();
 	}
 
@@ -555,9 +464,6 @@
 
 	mlog_entry_void ();
 
-	if (ocfs_table_header)
-		unregister_sysctl_table(ocfs_table_header);
-
 	ocfs_free_mem_caches();
 
 	/* Deinit the proc interface */