From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28746 invoked by alias); 22 Jun 2009 16:54:47 -0000 Received: (qmail 28740 invoked by alias); 22 Jun 2009 16:54:47 -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: rgmanager: master - rgmanager: Fix fo_domain.c build warnings (part 2) To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 63299b87a55c511f805319b8115a80aced2d12bb X-Git-Newrev: db2487b59d7f4879e6c5cebeac548580f50ba934 From: Lon Hohberger Message-Id: <20090622165406.7A29E12027E@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 16:54: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/msg00635.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=db2487b59d7f4879e6c5cebeac548580f50ba934 Commit: db2487b59d7f4879e6c5cebeac548580f50ba934 Parent: 63299b87a55c511f805319b8115a80aced2d12bb Author: Lon Hohberger AuthorDate: Mon Jun 15 16:53:54 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 12:51:21 2009 -0400 rgmanager: Fix fo_domain.c build warnings (part 2) Signed-off-by: Lon Hohberger --- rgmanager/include/resgroup.h | 33 --------------------------------- rgmanager/include/reslist.h | 26 -------------------------- rgmanager/src/daemons/fo_domain.c | 1 + 3 files changed, 1 insertions(+), 59 deletions(-) diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h index 84442fd..1adcdc8 100644 --- a/rgmanager/include/resgroup.h +++ b/rgmanager/include/resgroup.h @@ -225,22 +225,6 @@ int rg_unlock(struct dlm_lksb *p); const char *rg_strerror(int val); - -/* - * Fail-over domain states - */ -#define FOD_ILLEGAL 0 -#define FOD_GOOD 1 -#define FOD_BETTER 2 -#define FOD_BEST 3 - -/* - Fail-over domain flags - */ -#define FOD_ORDERED (1<<0) -#define FOD_RESTRICTED (1<<1) -#define FOD_NOFAILBACK (1<<2) - /* Status tree flags */ @@ -257,23 +241,6 @@ const char *rg_strerror(int val); fflush(stdout);\ } -#if 0 -#define pthread_mutex_lock(mutex) \ -{\ - printf("lock(%s) @ %s:%d\n", #mutex, __FUNCTION__, __LINE__);\ - fflush(stdout);\ - pthread_mutex_lock(mutex);\ -} - - -#define pthread_mutex_unlock(mutex) \ -{\ - printf("unlock(%s) @ %s:%d\n", #mutex, __FUNCTION__, __LINE__);\ - fflush(stdout);\ - pthread_mutex_unlock(mutex);\ -} -#endif - #else /* DEBUG */ #define dbg_printf(fmt, args...) diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 1052f94..564f93d 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -118,21 +118,6 @@ typedef struct _rg_node { int rn_pad; } resource_node_t; -typedef struct _fod_node { - list_head(); - char *fdn_name; - int fdn_prio; - int fdn_nodeid; -} fod_node_t; - -typedef struct _fod { - list_head(); - char *fd_name; - fod_node_t *fd_nodes; - int fd_flags; - int _pad_; /* align */ -} fod_t; - /* Exported Functions @@ -178,17 +163,6 @@ int build_resource_tree(int ccsfd, resource_node_t **tree, void print_resource_tree(resource_node_t **tree); void destroy_resource_tree(resource_node_t **tree); -/* - Construct/deconstruct failover domains - */ -int construct_domains(int ccsfd, fod_t **domains); -void deconstruct_domains(fod_t **domains); -void print_domains(fod_t **domains); -int node_should_start(int nodeid, cluster_member_list_t *membership, - char *rg_name, fod_t **domains); -int node_domain_set(fod_t **domains, char *name, int **ret, int *retlen, int *flags); -int node_domain_set_safe(char *domainname, int **ret, int *retlen, int *flags); - /* Handy functions diff --git a/rgmanager/src/daemons/fo_domain.c b/rgmanager/src/daemons/fo_domain.c index 54c082c..666d187 100644 --- a/rgmanager/src/daemons/fo_domain.c +++ b/rgmanager/src/daemons/fo_domain.c @@ -17,6 +17,7 @@ #include #include #include +#include //#define DEBUG