Cluster Project branch, master, updated. gfs-kernel_0_1_22-101-g52d85c3

Cluster Project branch, master, updated. gfs-kernel_0_1_22-101-g52d85c3

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=52d85c30227993e5ae60c8846eef3baf42c279d5

The branch, master has been updated
       via  52d85c30227993e5ae60c8846eef3baf42c279d5 (commit)
      from  b593d15ea42423440da2e6fdaf2bb9754d03632b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52d85c30227993e5ae60c8846eef3baf42c279d5
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date:   Fri Mar 28 05:52:34 2008 +0100

    [CMAN] Do not duplicate entries in the objdb
    
    A dump-db did show duplicate entries of logging and totem
    because we were not looking for previous entries correctly.
    
    Make sure to reset to the proper handle before searching.
    
    Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>

-----------------------------------------------------------------------

Summary of changes:
 cman/daemon/cman-preconfig.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index b3dc805..ba114bc 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -127,10 +127,11 @@ static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr,
 		return -1;
 	}
 
-        if (objdb->object_find(OBJECT_PARENT_HANDLE,
+	objdb->object_find_reset(OBJECT_PARENT_HANDLE);
+	if (objdb->object_find(OBJECT_PARENT_HANDLE,
 			       "totem", strlen("totem"), &totem_object_handle)) {
 
-                objdb->object_create(OBJECT_PARENT_HANDLE, &totem_object_handle,
+		objdb->object_create(OBJECT_PARENT_HANDLE, &totem_object_handle,
 				     "totem", strlen("totem"));
         }
 
@@ -616,6 +617,7 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
 	}
 
 	/* Make sure mainconfig doesn't stomp on our logging options */
+	objdb->object_find_reset(OBJECT_PARENT_HANDLE);
 	if (objdb->object_find(OBJECT_PARENT_HANDLE,
 			       "logging", strlen("logging"), &object_handle)) {
 


hooks/post-receive
--
Cluster Project