[Ocfs2-tools-commits] manish commits r828 - trunk/libo2cb

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Date: 2005-04-19 18:30:41 -0500 (Tue, 19 Apr 2005)
New Revision: 828

Modified:
   trunk/libo2cb/o2cb_abi.c
   trunk/libo2cb/o2cb_err.et
Log:
Return a better error message if the /proc path isn't there.

Signed-off-by: mfasheh


Modified: trunk/libo2cb/o2cb_abi.c
===================================================================
--- trunk/libo2cb/o2cb_abi.c	2005-04-19 22:46:02 UTC (rev 827)
+++ trunk/libo2cb/o2cb_abi.c	2005-04-19 23:30:41 UTC (rev 828)
@@ -742,8 +742,12 @@
 #define HB_CTL_PATH	"/proc/sys/fs/ocfs2/nm/hb_ctl_path"
 
 	fd = open(HB_CTL_PATH, O_RDONLY);
-	if (fd == -1)
-		return errno;
+	if (fd == -1) {
+		if (errno == ENOENT)
+			return O2CB_ET_MODULE_NOT_LOADED;
+		else
+			return errno;
+	}
 
 	while (total < count) {
 		ret = read(fd, buf + total, count - total);

Modified: trunk/libo2cb/o2cb_err.et
===================================================================
--- trunk/libo2cb/o2cb_err.et	2005-04-19 22:46:02 UTC (rev 827)
+++ trunk/libo2cb/o2cb_err.et	2005-04-19 23:30:41 UTC (rev 828)
@@ -66,4 +66,7 @@
 ec	O2CB_ET_INVALID_NODE_NUM,
 	"Node number is invalid"
 
+ec	O2CB_ET_MODULE_NOT_LOADED,
+	"Node manager kernel module is not loaded"
+
 	end