Gitweb:
http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=7ca6817d...
Commit: 7ca6817d7a4dad7c4d96c41ad548ceccbd167e48
Parent: 43931c355acc80658345a73c78ca866016938d32
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Oct 6 11:44:06 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Oct 6 11:44:06 2011 -0500
dlm_controld: use EXTERN
to clean up declarations
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
dlm_controld/config.h | 47 ------------------------
dlm_controld/deadlock.c | 1 -
dlm_controld/dlm_daemon.h | 86 ++++++++++++++++++++++++++++++++++-----------
dlm_controld/main.c | 68 ++++++++---------------------------
dlm_controld/netlink.c | 1 -
5 files changed, 80 insertions(+), 123 deletions(-)
diff --git a/dlm_controld/config.h b/dlm_controld/config.h
deleted file mode 100644
index ab37eed..0000000
--- a/dlm_controld/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __CONFIG_DOT_H__
-#define __CONFIG_DOT_H__
-
-/* the kernel has default values for debug, timewarn and protocol;
- we only change them if new values are given on command line or in ccs */
-
-#define DEFAULT_DEBUG_LOGFILE 0
-#define DEFAULT_ENABLE_FENCING 1
-#define DEFAULT_ENABLE_QUORUM 0
-#define DEFAULT_ENABLE_PLOCK 1
-#define DEFAULT_PLOCK_DEBUG 0
-#define DEFAULT_PLOCK_RATE_LIMIT 0
-#define DEFAULT_PLOCK_OWNERSHIP 0
-#define DEFAULT_DROP_RESOURCES_TIME 10000 /* 10 sec */
-#define DEFAULT_DROP_RESOURCES_COUNT 10
-#define DEFAULT_DROP_RESOURCES_AGE 10000 /* 10 sec */
-
-extern int optk_debug;
-extern int optk_timewarn;
-extern int optk_protocol;
-extern int optd_debug_logfile;
-extern int optd_enable_fencing;
-extern int optd_enable_quorum;
-extern int optd_enable_plock;
-extern int optd_plock_debug;
-extern int optd_plock_rate_limit;
-extern int optd_plock_ownership;
-extern int optd_drop_resources_time;
-extern int optd_drop_resources_count;
-extern int optd_drop_resources_age;
-
-extern int cfgk_debug;
-extern int cfgk_timewarn;
-extern int cfgk_protocol;
-extern int cfgd_debug_logfile;
-extern int cfgd_enable_fencing;
-extern int cfgd_enable_quorum;
-extern int cfgd_enable_plock;
-extern int cfgd_plock_debug;
-extern int cfgd_plock_rate_limit;
-extern int cfgd_plock_ownership;
-extern int cfgd_drop_resources_time;
-extern int cfgd_drop_resources_count;
-extern int cfgd_drop_resources_age;
-
-#endif
-
diff --git a/dlm_controld/deadlock.c b/dlm_controld/deadlock.c
index bd1d68c..6aaabc5 100644
--- a/dlm_controld/deadlock.c
+++ b/dlm_controld/deadlock.c
@@ -1,5 +1,4 @@
#include "dlm_daemon.h"
-#include "config.h"
#include "libdlm.h"
static SaCkptHandleT global_ckpt_h;
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index 5d12296..d0975af 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -38,11 +38,19 @@
#include <linux/dlmconstants.h>
#include "libdlmcontrol.h"
#include "dlm_controld.h"
-#include "config.h"
#include "list.h"
#include "rbtree.h"
#include "linux_endian.h"
+#ifndef EXTERN
+#define EXTERN extern
+#else
+#undef EXTERN
+#define EXTERN
+#endif
+
+#define DAEMON_NAME "dlm_controld"
+
/* TODO: get CONFDIR, LOGDIR, RUNDIR from build */
#define RUNDIR "/var/run/cluster"
@@ -63,8 +71,16 @@
#define DEFAULT_LOGFILE_PRIORITY LOG_INFO
#define DEFAULT_LOGFILE LOG_FILE_PATH
-#define DAEMON_NAME "dlm_controld"
-
+#define DEFAULT_DEBUG_LOGFILE 0
+#define DEFAULT_ENABLE_FENCING 1
+#define DEFAULT_ENABLE_QUORUM 0
+#define DEFAULT_ENABLE_PLOCK 1
+#define DEFAULT_PLOCK_DEBUG 0
+#define DEFAULT_PLOCK_RATE_LIMIT 0
+#define DEFAULT_PLOCK_OWNERSHIP 0
+#define DEFAULT_DROP_RESOURCES_TIME 10000 /* 10 sec */
+#define DEFAULT_DROP_RESOURCES_COUNT 10
+#define DEFAULT_DROP_RESOURCES_AGE 10000 /* 10 sec */
/* DLM_LOCKSPACE_LEN: maximum lockspace name length, from linux/dlmconstants.h.
Copied in libdlm.h so apps don't need to include the kernel header.
@@ -91,24 +107,52 @@
#define PROTO_SCTP 1
#define PROTO_DETECT 2
-extern int daemon_debug_opt;
-extern int daemon_quit;
-extern int cluster_down;
-extern int poll_fencing;
-extern int poll_quorum;
-extern int poll_fs;
-extern int poll_ignore_plock;
-extern int poll_drop_plock;
-extern int plock_fd;
-extern int plock_ci;
-extern struct list_head lockspaces;
-extern int cluster_quorate;
-extern uint32_t cluster_ringid_seq;
-extern int our_nodeid;
-extern uint32_t control_minor;
-extern uint32_t monitor_minor;
-extern uint32_t plock_minor;
-extern uint32_t old_plock_minor;
+EXTERN int daemon_debug_opt;
+EXTERN int daemon_quit;
+EXTERN int cluster_down;
+EXTERN int poll_fencing;
+EXTERN int poll_quorum;
+EXTERN int poll_fs;
+EXTERN int poll_ignore_plock;
+EXTERN int poll_drop_plock;
+EXTERN int plock_fd;
+EXTERN int plock_ci;
+EXTERN struct list_head lockspaces;
+EXTERN int cluster_quorate;
+EXTERN uint32_t cluster_ringid_seq;
+EXTERN int our_nodeid;
+EXTERN uint32_t control_minor;
+EXTERN uint32_t monitor_minor;
+EXTERN uint32_t plock_minor;
+EXTERN uint32_t old_plock_minor;
+
+EXTERN int optk_debug;
+EXTERN int optk_timewarn;
+EXTERN int optk_protocol;
+EXTERN int optd_debug_logfile;
+EXTERN int optd_enable_fencing;
+EXTERN int optd_enable_quorum;
+EXTERN int optd_enable_plock;
+EXTERN int optd_plock_debug;
+EXTERN int optd_plock_rate_limit;
+EXTERN int optd_plock_ownership;
+EXTERN int optd_drop_resources_time;
+EXTERN int optd_drop_resources_count;
+EXTERN int optd_drop_resources_age;
+
+EXTERN int cfgk_debug;
+EXTERN int cfgk_timewarn;
+EXTERN int cfgk_protocol;
+EXTERN int cfgd_debug_logfile;
+EXTERN int cfgd_enable_fencing;
+EXTERN int cfgd_enable_quorum;
+EXTERN int cfgd_enable_plock;
+EXTERN int cfgd_plock_debug;
+EXTERN int cfgd_plock_rate_limit;
+EXTERN int cfgd_plock_ownership;
+EXTERN int cfgd_drop_resources_time;
+EXTERN int cfgd_drop_resources_count;
+EXTERN int cfgd_drop_resources_age;
#define LOG_DUMP_SIZE DLMC_DUMP_SIZE
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
index e940fc0..a931aa6 100644
--- a/dlm_controld/main.c
+++ b/dlm_controld/main.c
@@ -1,3 +1,4 @@
+#define EXTERN
#include "dlm_daemon.h"
#include <pthread.h>
#include <linux/netlink.h>
@@ -1234,6 +1235,20 @@ int main(int argc, char **argv)
{
int fd;
+ cfgk_debug = -1;
+ cfgk_timewarn = -1;
+ cfgk_protocol = PROTO_DETECT;
+ cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE;
+ cfgd_enable_fencing = DEFAULT_ENABLE_FENCING;
+ cfgd_enable_quorum = DEFAULT_ENABLE_QUORUM;
+ cfgd_enable_plock = DEFAULT_ENABLE_PLOCK;
+ cfgd_plock_debug = DEFAULT_PLOCK_DEBUG;
+ cfgd_plock_rate_limit = DEFAULT_PLOCK_RATE_LIMIT;
+ cfgd_plock_ownership = DEFAULT_PLOCK_OWNERSHIP;
+ cfgd_drop_resources_time = DEFAULT_DROP_RESOURCES_TIME;
+ cfgd_drop_resources_count = DEFAULT_DROP_RESOURCES_COUNT;
+ cfgd_drop_resources_age = DEFAULT_DROP_RESOURCES_AGE;
+
INIT_LIST_HEAD(&lockspaces);
INIT_LIST_HEAD(&fs_register_list);
@@ -1264,56 +1279,3 @@ int main(int argc, char **argv)
return 0;
}
-int daemon_debug_opt;
-int daemon_quit;
-int cluster_down;
-int poll_fencing;
-int poll_quorum;
-int poll_fs;
-int poll_ignore_plock;
-int poll_drop_plock;
-int plock_fd;
-int plock_ci;
-struct list_head lockspaces;
-int cluster_quorate;
-int our_nodeid;
-uint32_t cluster_ringid_seq;
-uint32_t control_minor;
-uint32_t monitor_minor;
-uint32_t plock_minor;
-uint32_t old_plock_minor;
-
-/* was a config value set on command line?, 0 or 1.
- optk is a kernel option, optd is a daemon option */
-
-int optk_debug;
-int optk_timewarn;
-int optk_protocol;
-int optd_debug_logfile;
-int optd_enable_fencing;
-int optd_enable_quorum;
-int optd_enable_plock;
-int optd_plock_debug;
-int optd_plock_rate_limit;
-int optd_plock_ownership;
-int optd_drop_resources_time;
-int optd_drop_resources_count;
-int optd_drop_resources_age;
-
-/* actual config value from command line, cluster.conf, or default.
- cfgk is a kernel config value, cfgd is a daemon config value */
-
-int cfgk_debug = -1;
-int cfgk_timewarn = -1;
-int cfgk_protocol = PROTO_DETECT;
-int cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE;
-int cfgd_enable_fencing = DEFAULT_ENABLE_FENCING;
-int cfgd_enable_quorum = DEFAULT_ENABLE_QUORUM;
-int cfgd_enable_plock = DEFAULT_ENABLE_PLOCK;
-int cfgd_plock_debug = DEFAULT_PLOCK_DEBUG;
-int cfgd_plock_rate_limit = DEFAULT_PLOCK_RATE_LIMIT;
-int cfgd_plock_ownership = DEFAULT_PLOCK_OWNERSHIP;
-int cfgd_drop_resources_time = DEFAULT_DROP_RESOURCES_TIME;
-int cfgd_drop_resources_count = DEFAULT_DROP_RESOURCES_COUNT;
-int cfgd_drop_resources_age = DEFAULT_DROP_RESOURCES_AGE;
-
diff --git a/dlm_controld/netlink.c b/dlm_controld/netlink.c
index 63122f7..9f1d382 100644
--- a/dlm_controld/netlink.c
+++ b/dlm_controld/netlink.c
@@ -1,5 +1,4 @@
#include "dlm_daemon.h"
-#include "config.h"
#include <linux/dlm.h>
#include <linux/netlink.h>
#include <linux/genetlink.h>