[Ocfs2-tools-commits] smushran commits r1163 - in trunk: libo2cb mounted.ocfs2

[svn-commits@oss.oracle.com]

Author: smushran
Date: 2006-02-23 18:35:15 -0600 (Thu, 23 Feb 2006)
New Revision: 1163

Modified:
   trunk/libo2cb/o2cb_abi.c
   trunk/mounted.ocfs2/mounted.c
Log:
fix for bugzilla#680 mounted.ocfs2 not showing node names

Modified: trunk/libo2cb/o2cb_abi.c
===================================================================
--- trunk/libo2cb/o2cb_abi.c	2006-02-23 23:48:39 UTC (rev 1162)
+++ trunk/libo2cb/o2cb_abi.c	2006-02-24 00:35:15 UTC (rev 1163)
@@ -1220,6 +1220,9 @@
 	char path[PATH_MAX];
 	errcode_t ret;
 
+	if (configfs_path == NULL)
+		return O2CB_ET_SERVICE_UNAVAILABLE;
+
 	ret = snprintf(path, PATH_MAX - 1, O2CB_FORMAT_CLUSTER_DIR,
 		       configfs_path);
 	if ((ret <= 0) || (ret == (PATH_MAX - 1)))
@@ -1238,6 +1241,9 @@
 	char path[PATH_MAX];
 	errcode_t ret;
 
+	if (configfs_path == NULL)
+		return O2CB_ET_SERVICE_UNAVAILABLE;
+
 	ret = snprintf(path, PATH_MAX - 1, O2CB_FORMAT_NODE_DIR,
 		       configfs_path, cluster_name);
 	if ((ret <= 0) || (ret == (PATH_MAX - 1)))

Modified: trunk/mounted.ocfs2/mounted.c
===================================================================
--- trunk/mounted.ocfs2/mounted.c	2006-02-23 23:48:39 UTC (rev 1162)
+++ trunk/mounted.ocfs2/mounted.c	2006-02-24 00:35:15 UTC (rev 1163)
@@ -285,6 +285,8 @@
 	if (ret)
 		goto bail;
 
+	o2cb_init();
+
 	ret = ocfs2_detect(device, quick_detect);
 
 bail: