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

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: jlbec
Date: 2005-04-29 20:33:05 -0500 (Fri, 29 Apr 2005)
New Revision: 2205

Modified:
   trunk/fs/ocfs2/proc.c
Log:
* replace the unused and unfilled 'mountpoint' proc file with a uuid
  one

Signed-off-by: jlbec



Modified: trunk/fs/ocfs2/proc.c
===================================================================
--- trunk/fs/ocfs2/proc.c	2005-04-30 00:44:33 UTC (rev 2204)
+++ trunk/fs/ocfs2/proc.c	2005-04-30 01:33:05 UTC (rev 2205)
@@ -47,16 +47,16 @@
 
 static struct proc_dir_entry *ocfs2_proc_root_dir = NULL; /* points to /proc/fs/ocfs2 */
 
-static int ocfs_proc_version (char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_nodenum (char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_slotnum (char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_nodename (char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_mountpoint (char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_statistics (char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_device (char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_nodes (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);
+static int ocfs_proc_nodenum(char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs_proc_slotnum(char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs_proc_nodename(char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs2_proc_uuid(char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs_proc_statistics(char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs_proc_device(char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs_proc_nodes(char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_alloc_stat(char *page, char **start, off_t off, int count, int *eof, void *data);
-static int ocfs_proc_label (char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs_proc_label(char *page, char **start, off_t off, int count, int *eof, void *data);
 
 typedef struct _ocfs_proc_list
 {
@@ -75,7 +75,7 @@
 
 ocfs_proc_list sub_dir[] = {
 	{ "nodenum", NULL, ocfs_proc_nodenum, NULL, S_IFREG | S_IRUGO, },
-	{ "mountpoint", NULL, ocfs_proc_mountpoint, NULL, S_IFREG | S_IRUGO, },
+	{ "uuid", NULL, ocfs2_proc_uuid, NULL, S_IFREG | S_IRUGO, },
 	{ "slotnum", NULL, ocfs_proc_slotnum, NULL, S_IFREG | S_IRUGO, },
 	{ "statistics", NULL, ocfs_proc_statistics, NULL, S_IFREG | S_IRUGO, },
 	{ "device", NULL, ocfs_proc_device, NULL, S_IFREG | S_IRUGO, },
@@ -359,23 +359,23 @@
 }				/* ocfs_proc_remove_volume */
 
 /*
- * ocfs_proc_mountpoint()
+ * ocfs2_proc_uuid()
  *
  */
-static int ocfs_proc_mountpoint (char *page, char **start, off_t off,
-				 int count, int *eof, void *data)
+static int ocfs2_proc_uuid(char *page, char **start, off_t off,
+			   int count, int *eof, void *data)
 {
-	int len;
-	int ret;
+	int len, ret;
+	ocfs_super *osb = data;
 
-	mlog_entry_void ();
+	mlog_entry_void();
 
-	len = sprintf(page, "unknown\n");
-	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
+	len = sprintf(page, "%s\n", osb->uuid_str);
+	ret = ocfs_proc_calc_metrics(page, start, off, count, eof, len);
 
-	mlog_exit (ret);
+	mlog_exit(ret);
 	return ret;
-}				/* ocfs_proc_mountpoint */
+}				/* ocfs2_proc_uuid */
 
 /*
  * ocfs_proc_statistics()