From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8672 invoked by alias); 14 Aug 2008 20:13:17 -0000 Received: (qmail 8666 invoked by alias); 14 Aug 2008 20:13:16 -0000 X-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_14,J_CHICKENPOX_16 X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on hosted1.fedoraproject.org X-Spam-Level: Subject: master - dlm_controld: fix nodeid in fs_result To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bf086190062aac0f53b35be51ef49ad243731623 X-Git-Newrev: 44861eae0e3530360c6e848aa5d86f482ede70e5 From: David Teigland Message-Id: <20080814201226.4C8F712002B@lists.fedorahosted.org> Date: Thu, 14 Aug 2008 21:05:00 -0000 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00269.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=44861eae0e3530360c6e848aa5d86f482ede70e5 Commit: 44861eae0e3530360c6e848aa5d86f482ede70e5 Parent: bf086190062aac0f53b35be51ef49ad243731623 Author: David Teigland AuthorDate: Thu Aug 14 15:02:49 2008 -0500 Committer: David Teigland 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 --- 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: