Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-66-g532a3cd

[lhh@sourceware.org]

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=532a3cdbc09cfc0dfd85296ccc613f2753acce22

The branch, RHEL4 has been updated
       via  532a3cdbc09cfc0dfd85296ccc613f2753acce22 (commit)
      from  b9a120827b951c81b2e9a2b631698fa92311c04f (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 532a3cdbc09cfc0dfd85296ccc613f2753acce22
Author: Lon Hohberger <lhh@redhat.com>
Date:   Tue May 27 17:54:53 2008 -0400

    [rgmanager] Fix if() clause which broke VF locking with gulm plugin
    
    Resolves bz448108

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

Summary of changes:
 rgmanager/src/clulib/vft.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/clulib/vft.c b/rgmanager/src/clulib/vft.c
index 29e51bc..fea3a2c 100644
--- a/rgmanager/src/clulib/vft.c
+++ b/rgmanager/src/clulib/vft.c
@@ -1257,7 +1257,7 @@ vf_write(cluster_member_list_t *membership, uint32_t flags, char *keyid,
 	uint32_t totallen;
 	struct timeval start, end, dif;
 	void *lockp = NULL;
-	int l;
+	int l = 1; /* keep track of whether we got a lock */
 	char lock_name[256];
 	int my_status;
 	int ret_status = 0;
@@ -1434,7 +1434,11 @@ out_cleanup:
 	 */
 	if (join_view)
 		free(join_view);
-	if (lockp)
+	if (l == 0) /* from clu_lock() above - if 0,
+		       we have a lock to release.  Note that vf_read
+		       uses 'l' for another use; maybe we should
+		       clean it up for maintenance.  This fixes
+		       bugzilla #448108 */
 		clu_unlock(lock_name, lockp);
 
 	pthread_mutex_unlock(&vf_mutex);


hooks/post-receive
--
Cluster Project