From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24057 invoked by alias); 4 Feb 2009 21:17:40 -0000 Received: (qmail 24050 invoked by alias); 4 Feb 2009 21:17:39 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: the tag dlm-kernel_2_6_9_57 has been created To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/tags/dlm-kernel_2_6_9_57 X-Git-Reftype: tag X-Git-Oldrev: c4a768addd3891029c141a2ccdc9a2032c855412 X-Git-Newrev: 729d4d6350276969808a70993e0464164b7ec38e From: Chris Feist Message-Id: <20090204211719.61ECB1205B4@lists.fedorahosted.org> Date: Wed, 04 Feb 2009 21:17:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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: 2009-q1/txt/msg00381.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=729d4d6350276969808a70993e0464164b7ec38e Commit: 729d4d6350276969808a70993e0464164b7ec38e Parent: c4a768addd3891029c141a2ccdc9a2032c855412 Author: Christine Caulfield AuthorDate: Wed Feb 4 14:56:50 2009 +0000 Committer: Christine Caulfield CommitterDate: Wed Feb 4 14:56:50 2009 +0000 cman_tool: show node state correctly on a configless cluster Signed-off-by: Christine Caulfield --- cman/services/cman/lib/libcman.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cman/services/cman/lib/libcman.c b/cman/services/cman/lib/libcman.c index 148881f..56ade49 100644 --- a/cman/services/cman/lib/libcman.c +++ b/cman/services/cman/lib/libcman.c @@ -1053,7 +1053,7 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_ int ccs_handle; char *value; int ret; - int i,j; + int i; int num_nodes = 0; char path[PATH_MAX]; int noconfig_flag=0; @@ -1099,13 +1099,7 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_ sprintf(nodes[i].cn_name, "Node-%x", nodes[i].cn_nodeid); } - /* Reconcile with active nodes list. */ - for (j=0; j < cman_inst->node_count; j++) { - if (cman_inst->node_list[j].nodeid == nodes[i].cn_nodeid) { - nodes[i].cn_member = (cman_inst->node_list[j].state == NODESTATE_MEMBER); - } - } - + nodes[i].cn_member = (cman_inst->node_list[i].state == NODESTATE_MEMBER); } } else {