public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - rgmanager: Clean up rg_event.c and related build warnings Date: Mon, 22 Jun 2009 13:33:00 -0000 [thread overview] Message-ID: <20090622133313.C15D412027E@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f0946a38b2d187b8a903a6a1c98d468eedba1d3d Commit: f0946a38b2d187b8a903a6a1c98d468eedba1d3d Parent: 3a90f501a2b270c7d0628e0893838401a1f30e73 Author: Lon Hohberger <lhh@redhat.com> AuthorDate: Tue Jun 16 14:25:54 2009 -0400 Committer: Lon Hohberger <lhh@redhat.com> CommitterDate: Mon Jun 22 09:32:03 2009 -0400 rgmanager: Clean up rg_event.c and related build warnings Signed-off-by: Lon Hohberger <lhh@redhat.com> --- rgmanager/include/event.h | 2 ++ rgmanager/include/lock.h | 4 ++-- rgmanager/include/rg_locks.h | 5 +++++ rgmanager/src/clulib/lock.c | 4 ++-- rgmanager/src/daemons/main.c | 6 ------ rgmanager/src/daemons/rg_event.c | 8 ++++++-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h index 7c91a8f..aaa1900 100644 --- a/rgmanager/include/event.h +++ b/rgmanager/include/event.h @@ -131,5 +131,7 @@ void node_event(int local, int nodeID, int nodeStatus, int clean); int32_t master_event_callback(char *key, uint64_t viewno, void *data, uint32_t datalen); +int node_has_fencing(int nodeid); +int fence_domain_joined(void); #endif diff --git a/rgmanager/include/lock.h b/rgmanager/include/lock.h index 4fab545..7941304 100644 --- a/rgmanager/include/lock.h +++ b/rgmanager/include/lock.h @@ -7,7 +7,7 @@ #include <libdlm.h> int clu_ls_lock(dlm_lshandle_t ls, int mode, struct dlm_lksb *lksb, - int options, char *resource); + int options, const char *resource); dlm_lshandle_t clu_open_lockspace(const char *lsname); int clu_ls_unlock(dlm_lshandle_t ls, struct dlm_lksb *lksb); int clu_close_lockspace(dlm_lshandle_t ls, const char *lsname); @@ -15,7 +15,7 @@ int clu_close_lockspace(dlm_lshandle_t ls, const char *lsname); /* Default lockspace wrappers */ int clu_lock_init(const char *default_lsname); int clu_lock(int mode, struct dlm_lksb *lksb, - int options, char *resource); + int options, const char *resource); int clu_unlock(struct dlm_lksb *lksb); void clu_lock_finished(const char *default_lsname); diff --git a/rgmanager/include/rg_locks.h b/rgmanager/include/rg_locks.h index a427749..6fbd887 100644 --- a/rgmanager/include/rg_locks.h +++ b/rgmanager/include/rg_locks.h @@ -4,6 +4,11 @@ int rg_running(void); int rg_locked(void); + +#define L_SHUTDOWN (1<<2) +#define L_SYS (1<<1) +#define L_USER (1<<0) + int rg_lockall(int flag); int rg_unlockall(int flag); diff --git a/rgmanager/src/clulib/lock.c b/rgmanager/src/clulib/lock.c index 3a40574..be542c1 100644 --- a/rgmanager/src/clulib/lock.c +++ b/rgmanager/src/clulib/lock.c @@ -45,7 +45,7 @@ clu_ls_lock(dlm_lshandle_t ls, int mode, struct dlm_lksb *lksb, int options, - char *resource) + const char *resource) { int ret; @@ -156,7 +156,7 @@ int clu_lock(int mode, struct dlm_lksb *lksb, int options, - char *resource) + const char *resource) { int ret = 0, block = 0, conv = 0, err; diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index c289565..5e32135 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -23,10 +23,6 @@ #include <daemon_init.h> #include <groups.h> -#define L_SHUTDOWN (1<<2) -#define L_SYS (1<<1) -#define L_USER (1<<0) - #ifdef WRAP_THREADS void dump_thread_states(FILE *); #endif @@ -35,8 +31,6 @@ void set_transition_throttling(int); static void flag_shutdown(int sig); -int node_has_fencing(int nodeid); -int fence_domain_joined(void); int watchdog_init(void); diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c index 061749d..d03f4e3 100644 --- a/rgmanager/src/daemons/rg_event.c +++ b/rgmanager/src/daemons/rg_event.c @@ -1,3 +1,7 @@ +#include <time.h> +#include <list.h> +#include <restart_counter.h> +#include <reslist.h> #include <resgroup.h> #include <rg_locks.h> #include <gettid.h> @@ -10,7 +14,7 @@ #include <stdint.h> #include <vf.h> #include <members.h> -#include <time.h> +#include <groups.h> /** @@ -364,7 +368,7 @@ out: Event handling function. This only stays around as long as events are on the queue. */ -void * +static void * _event_thread_f(void __attribute__ ((unused)) *arg) { event_t *ev;
reply other threads:[~2009-06-22 13:33 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090622133313.C15D412027E@lists.fedorahosted.org \ --to=lon@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).