[Ocfs2-tools-commits] smushran commits r898 - in trunk: mkfs.ocfs2 mount.ocfs2 mounted.ocfs2

[svn-commits at oss.oracle.com]

Author: smushran
Signed-off-by: mfasheh
Date: 2005-05-18 19:43:39 -0500 (Wed, 18 May 2005)
New Revision: 898

Modified:
   trunk/mkfs.ocfs2/Cscope.make
   trunk/mkfs.ocfs2/check.c
   trunk/mount.ocfs2/mount.ocfs2.c
   trunk/mounted.ocfs2/mounted.c
Log:
mounted.ocfs2 no longer calls o2cb_init
some error messages in mount.ocfs2 cleaned up
Signed-off-by: mfasheh

Modified: trunk/mkfs.ocfs2/Cscope.make
===================================================================
--- trunk/mkfs.ocfs2/Cscope.make	2005-05-18 22:15:01 UTC (rev 897)
+++ trunk/mkfs.ocfs2/Cscope.make	2005-05-19 00:43:39 UTC (rev 898)
@@ -2,9 +2,8 @@
 cscope:
 	rm -f cscope.*
 	echo "-k" >> cscope.files
-	echo "-I inc" >> cscope.files
-	find . -maxdepth 2 -name '*.c' -print | grep -v mkfs2.c >>cscope.files
-	find . -maxdepth 2 -name '*.h' -print >>cscope.files
-	find ../libocfs2/ -maxdepth 2 -name '*.h' -print >>cscope.files
-	find ../libocfs2/ -maxdepth 2 -name '*.c' -print >>cscope.files
+	find . -name '*.[ch]' >>cscope.files
+	find ../libocfs2/ -name '*.[ch]' >>cscope.files
+	find ../libo2cb/ -name '*.[ch]' >>cscope.files
+	find ../libo2dlm/ -name '*.[ch]' >>cscope.files
 	cscope -b

Modified: trunk/mkfs.ocfs2/check.c
===================================================================
--- trunk/mkfs.ocfs2/check.c	2005-05-18 22:15:01 UTC (rev 897)
+++ trunk/mkfs.ocfs2/check.c	2005-05-19 00:43:39 UTC (rev 898)
@@ -51,7 +51,7 @@
 		ret = o2cb_init();
 		if (ret) {
 			com_err(s->progname, ret,
-				"Cannot initialize cluster\n");
+				"while initializing the cluster");
 			return -1;
 		}
 

Modified: trunk/mount.ocfs2/mount.ocfs2.c
===================================================================
--- trunk/mount.ocfs2/mount.ocfs2.c	2005-05-18 22:15:01 UTC (rev 897)
+++ trunk/mount.ocfs2/mount.ocfs2.c	2005-05-19 00:43:39 UTC (rev 898)
@@ -302,7 +302,7 @@
 
 	ret = o2cb_init();
 	if (ret) {
-		com_err(progname, ret, "Cannot initialize cluster\n");
+		com_err(progname, ret, "Cannot initialize cluster");
 		goto bail;
 	}
 
@@ -322,7 +322,7 @@
 	if (ret) {
 		block_signals (SIG_UNBLOCK);
 		com_err(progname, 0, "Error when attempting to run %s: "
-			"\"%s\"\n", hb_ctl_path, strerror(ret));
+			"\"%s\"", hb_ctl_path, strerror(ret));
 		goto bail;
 	}
 
@@ -337,7 +337,7 @@
 	if (ret) {
 		stop_heartbeat(hb_ctl_path, mo.dev);
 		block_signals (SIG_UNBLOCK);
-		com_err(progname, errno, "while mounting %s on %s\n",
+		com_err(progname, errno, "while mounting %s on %s",
 			mo.dev, mo.dir);
 		goto bail;
 	}

Modified: trunk/mounted.ocfs2/mounted.c
===================================================================
--- trunk/mounted.ocfs2/mounted.c	2005-05-18 22:15:01 UTC (rev 897)
+++ trunk/mounted.ocfs2/mounted.c	2005-05-19 00:43:39 UTC (rev 898)
@@ -285,12 +285,6 @@
 	if (ret)
 		goto bail;
 
-	ret = o2cb_init();
-	if (ret) {
-		com_err(progname, ret, "Cannot initialize cluster\n");
-		goto bail;
-	}
-
 	ret = ocfs2_detect(device, quick_detect);
 
 bail: