This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - rgmanager: Fix --debug build
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Tue, 23 Jun 2009 14:08:26 +0000 (UTC)
- Subject: cluster: STABLE3 - rgmanager: Fix --debug build
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=40f6289f257fe1338cadfb5329acb1cf450342bc
Commit: 40f6289f257fe1338cadfb5329acb1cf450342bc
Parent: 58f5ea38060b84b91f043e6f51a2701343f04176
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Tue Jun 23 10:07:14 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue Jun 23 10:07:55 2009 -0400
rgmanager: Fix --debug build
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/include/resgroup.h | 2 ++
rgmanager/src/daemons/rg_state.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h
index 8e585e7..5dc84d4 100644
--- a/rgmanager/include/resgroup.h
+++ b/rgmanager/include/resgroup.h
@@ -181,9 +181,11 @@ uint32_t best_target_node(cluster_member_list_t *allowed, uint32_t owner,
const char *rg_name, int lock);
#ifdef DEBUG
+int _rg_lock(const char *name, struct dlm_lksb *p);
int _rg_lock_dbg(const char *, struct dlm_lksb *, const char *, int);
#define rg_lock(name, p) _rg_lock_dbg(name, p, __FILE__, __LINE__)
+int _rg_unlock(struct dlm_lksb *p);
int _rg_unlock_dbg(struct dlm_lksb *, const char *, int);
#define rg_unlock(p) _rg_unlock_dbg(p, __FILE__, __LINE__)
diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 75948e4..16204e1 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -141,7 +141,7 @@ rg_unlock(struct dlm_lksb *p)
#ifdef DEBUG
int
-_rg_unlock_dbg(struct dlm_lksb *p, char *file, int line)
+_rg_unlock_dbg(struct dlm_lksb *p, const char *file, int line)
{
dbg_printf("rg_unlock() @ %s:%d\n", file, line);
return _rg_unlock(p);