public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: David Teigland <teigland@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: master - dlm_controld: fix nodeid in fs_result Date: Thu, 14 Aug 2008 21:05:00 -0000 [thread overview] Message-ID: <20080814201226.4C8F712002B@lists.fedorahosted.org> (raw) 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:
reply other threads:[~2008-08-14 20:13 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080814201226.4C8F712002B@lists.fedorahosted.org \ --to=teigland@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).