[Ocfs2-commits] mfasheh commits r888 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-04-30 15:12:32 -0500 (Fri, 30 Apr 2004)
New Revision: 888

Modified:
   trunk/src/proc.c
Log:
* move /proc entries to fs/ocfs2



Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-04-30 18:45:50 UTC (rev 887)
+++ trunk/src/proc.c	2004-04-30 20:12:32 UTC (rev 888)
@@ -33,8 +33,8 @@
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT      OCFS_DEBUG_CONTEXT_PROC
 
+#define OCFS2_PROC_BASENAME "fs/ocfs2"
 
-
 static int ocfs_proc_globalctxt(char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_dlm_stats(char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_version (char *page, char **start, off_t off, int count, int *eof, void *data);
@@ -65,19 +65,19 @@
 	}
 	*p, ProcList[] =
 	{
-		{ "ocfs2/version", NULL, ocfs_proc_version },
-		{ "ocfs2/nodename", NULL, ocfs_proc_nodename },
-		{ "ocfs2/globalctxt", NULL, ocfs_proc_globalctxt },
-		{ "ocfs2/lockstat", NULL, ocfs_proc_dlm_stats },
+		{ OCFS2_PROC_BASENAME "/version", NULL, ocfs_proc_version },
+		{ OCFS2_PROC_BASENAME "/nodename", NULL, ocfs_proc_nodename },
+		{ OCFS2_PROC_BASENAME "/globalctxt", NULL, ocfs_proc_globalctxt },
+		{ OCFS2_PROC_BASENAME "/lockstat", NULL, ocfs_proc_dlm_stats },
 #ifdef OCFS_LINUX_MEM_DEBUG
-		{ "ocfs2/memallocs", NULL, ocfs_proc_memallocs },
+		{ OCFS2_PROC_BASENAME "/memallocs", NULL, ocfs_proc_memallocs },
 #endif
 		{ NULL, }
 	};
 
 	LOG_ENTRY ();
 
-	proc_mkdir ("ocfs2", 0);
+	proc_mkdir (OCFS2_PROC_BASENAME, 0);
 
 	for (p = ProcList; p->name; p++)
 		create_proc_read_entry (p->name, 0, NULL, p->read_proc,
@@ -95,14 +95,14 @@
 {
 	LOG_ENTRY ();
 
-	remove_proc_entry ("ocfs2/version", NULL);
-	remove_proc_entry ("ocfs2/nodename", NULL);
-	remove_proc_entry ("ocfs2/globalctxt", NULL);
-	remove_proc_entry ("ocfs2/lockstat", NULL);
+	remove_proc_entry (OCFS2_PROC_BASENAME "/version", NULL);
+	remove_proc_entry (OCFS2_PROC_BASENAME "/nodename", NULL);
+	remove_proc_entry (OCFS2_PROC_BASENAME "/globalctxt", NULL);
+	remove_proc_entry (OCFS2_PROC_BASENAME "/lockstat", NULL);
 #ifdef OCFS_LINUX_MEM_DEBUG
-	remove_proc_entry ("ocfs2/memallocs", NULL);
+	remove_proc_entry (OCFS2_PROC_BASENAME "/memallocs", NULL);
 #endif
-	remove_proc_entry ("ocfs2", NULL);
+	remove_proc_entry (OCFS2_PROC_BASENAME, NULL);
 
 	LOG_EXIT ();
 	return;
@@ -492,7 +492,7 @@
 	ProcList[7].data = (char *) osb;
 	ProcList[8].data = (char *) osb;
 
-	sprintf (newdir, "ocfs2/%-d", osb->osb_id);
+	sprintf (newdir, OCFS2_PROC_BASENAME "/%-d", osb->osb_id);
 	proc_mkdir (newdir, 0);
 
 	for (p = ProcList; p->name; p++) {
@@ -525,11 +525,11 @@
 	}
 	
 	for (p = ProcList; p->name; p++) {
-		sprintf (tmp, "ocfs2/%-d/%s", osb->osb_id, p->name);
+		sprintf (tmp, OCFS2_PROC_BASENAME "/%-d/%s", osb->osb_id, p->name);
 		remove_proc_entry (tmp, NULL);
 	}
 
-	sprintf (tmp, "ocfs2/%-d", osb->osb_id);
+	sprintf (tmp, OCFS2_PROC_BASENAME "/%-d", osb->osb_id);
 	remove_proc_entry (tmp, NULL);
 
 bail: