Cluster Project branch, RHEL5, updated. cmirror_1_1_15-94-gbd01c4d

Cluster Project branch, RHEL5, updated. cmirror_1_1_15-94-gbd01c4d

[lhh]

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=bd01c4dadabba482a6981938bdc6ad7e61323721

The branch, RHEL5 has been updated
       via  bd01c4dadabba482a6981938bdc6ad7e61323721 (commit)
      from  9887ba84c5be5049322e1cbf1fb6b3d91ab5acec (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 bd01c4dadabba482a6981938bdc6ad7e61323721
Author: Lon Hohberger <lhh@redhat.com>
Date:   Tue May 27 16:36:52 2008 -0400

    [rgmanager] Fix build with -DDEBUG

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

Summary of changes:
 rgmanager/include/resgroup.h     |    2 +-
 rgmanager/src/daemons/rg_state.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h
index 22b262d..21e36ba 100644
--- a/rgmanager/include/resgroup.h
+++ b/rgmanager/include/resgroup.h
@@ -162,7 +162,7 @@ int _rg_lock_dbg(char *, struct dlm_lksb *, char *, int);
 #define rg_lock(name, p) _rg_lock_dbg(name, p, __FILE__, __LINE__)
 
 int _rg_unlock_dbg(struct dlm_lksb *, char *, int);
-#define rg_unlock(name, p) _rg_unlock_dbg(name, p, __FILE__, __LINE__)
+#define rg_unlock(p) _rg_unlock_dbg(p, __FILE__, __LINE__)
 
 #else
 int rg_lock(char *name, struct dlm_lksb *p);
diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 7dc2bbf..ffc5dfa 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -211,7 +211,7 @@ rg_unlock(struct dlm_lksb *p)
 
 #ifdef DEBUG
 int
-_rg_unlock_dbg(void *p, char *file, int line)
+_rg_unlock_dbg(struct dlm_lksb *p, char *file, int line)
 {
 	dprintf("rg_unlock() @ %s:%d\n", file, line);
 	return _rg_unlock(p);


hooks/post-receive
--
Cluster Project