master - dlm_controld: fix nodeid in fs_result

master - dlm_controld: fix nodeid in fs_result

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=44861eae0e3530360c6e848aa5d86f482ede70e5
Commit:        44861eae0e3530360c6e848aa5d86f482ede70e5
Parent:        bf086190062aac0f53b35be51ef49ad243731623
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Thu Aug 14 15:02:49 2008 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Thu Aug 14 15:03:59 2008 -0500

dlm_controld: fix nodeid in fs_result

was copying the wrong value so nodeid returned was zero

Signed-off-by: David Teigland <teigland@redhat.com>
---
 group/dlm_controld/cpg.c  |    8 ++++++--
 group/dlm_controld/main.c |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c
index f80bf91..6559906 100644
--- a/group/dlm_controld/cpg.c
+++ b/group/dlm_controld/cpg.c
@@ -1525,13 +1525,17 @@ int set_fs_notified(struct lockspace *ls, int nodeid)
 
 	/* this shouldn't happen */
 	node = get_node_history(ls, nodeid);
-	if (!node)
+	if (!node) {
+		log_error("set_fs_notified no nodeid %d", nodeid);
 		return -ESRCH;
+	}
 
 	/* this can happen, we haven't seen a nodedown for this node yet,
 	   but we should soon */
-	if (!node->check_fs)
+	if (!node->check_fs) {
+		log_group(ls, "set_fs_notified %d zero check_fs", nodeid);
 		return -EAGAIN;
+	}
 
 	node->fs_notified = 1;
 	return 0;
diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index a05cfe1..afa590d 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -683,7 +683,7 @@ static void process_connection(int ci)
 			rv = -ENOENT;
 		/* pass back the nodeid provided by caller in option field */
 		do_reply(client[ci].fd, DLMC_CMD_FS_NOTIFIED, h.name, rv,
-			 h.option, NULL, 0);
+			 h.data, NULL, 0);
 		break;
 
 	case DLMC_CMD_DEADLOCK_CHECK: