[Ocfs2-tools-commits] mfasheh commits r853 - trunk/mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-04-27 17:43:29 -0500 (Wed, 27 Apr 2005)
New Revision: 853

Modified:
   trunk/mkfs.ocfs2/check.c
Log:
* move the o2cb version check in mkfs so that people doing -F don't
  have to have the cluster stack loaded.



Modified: trunk/mkfs.ocfs2/check.c
===================================================================
--- trunk/mkfs.ocfs2/check.c	2005-04-27 20:36:44 UTC (rev 852)
+++ trunk/mkfs.ocfs2/check.c	2005-04-27 22:43:29 UTC (rev 853)
@@ -39,12 +39,6 @@
 	initialize_o2dl_error_table();
 	initialize_o2cb_error_table();
 
-	ret = o2cb_init();
-	if (ret) {
-		com_err(s->progname, ret, "Cannot initialize cluster\n");
-		return -1;
-	}
-
 	ret = ocfs2_open(s->device_name, OCFS2_FLAG_RW, 0, 0, &fs);
 	if (ret) {
 		if (ret == OCFS2_ET_OCFS_REV)
@@ -54,6 +48,13 @@
 		fprintf(stdout, "Overwriting existing ocfs2 partition.\n");
 
 	if (!s->force) {
+		ret = o2cb_init();
+		if (ret) {
+			com_err(s->progname, ret,
+				"Cannot initialize cluster\n");
+			return -1;
+		}
+
 		ret = ocfs2_initialize_dlm(fs);
 		if (ret) {
 			ocfs2_close(fs);