From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1255 invoked by alias); 23 Jun 2009 14:08:54 -0000 Received: (qmail 1249 invoked by alias); 23 Jun 2009 14:08:53 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - rgmanager: Fix --debug build To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 58f5ea38060b84b91f043e6f51a2701343f04176 X-Git-Newrev: 40f6289f257fe1338cadfb5329acb1cf450342bc From: Lon Hohberger Message-Id: <20090623140826.6F987120255@lists.fedorahosted.org> Date: Tue, 23 Jun 2009 14:08: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-q2/txt/msg00741.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=40f6289f257fe1338cadfb5329acb1cf450342bc Commit: 40f6289f257fe1338cadfb5329acb1cf450342bc Parent: 58f5ea38060b84b91f043e6f51a2701343f04176 Author: Lon Hohberger AuthorDate: Tue Jun 23 10:07:14 2009 -0400 Committer: Lon Hohberger CommitterDate: Tue Jun 23 10:07:55 2009 -0400 rgmanager: Fix --debug build Signed-off-by: Lon Hohberger --- 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);