[Ocfs2-tools-commits] smushran commits r1162 - in tags/ocfs2-tools-1.2.0: libo2cb mounted.ocfs2
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Thu Feb 23 17:48:40 CST 2006
Author: smushran
Signed-off-by: jlbec
Date: 2006-02-23 17:48:39 -0600 (Thu, 23 Feb 2006)
New Revision: 1162
Modified:
tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c
tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c
Log:
fix bugzilla#680 mounted.ocfs2 not showing node names
Signed-off-by: jlbec
Modified: tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c
===================================================================
--- tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c 2006-02-23 22:47:08 UTC (rev 1161)
+++ tags/ocfs2-tools-1.2.0/libo2cb/o2cb_abi.c 2006-02-23 23:48:39 UTC (rev 1162)
@@ -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: tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c
===================================================================
--- tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c 2006-02-23 22:47:08 UTC (rev 1161)
+++ tags/ocfs2-tools-1.2.0/mounted.ocfs2/mounted.c 2006-02-23 23:48:39 UTC (rev 1162)
@@ -285,6 +285,8 @@
if (ret)
goto bail;
+ o2cb_init();
+
ret = ocfs2_detect(device, quick_detect);
bail:
More information about the Ocfs2-tools-commits
mailing list