From 3c116860368772573a6d1eabc8a7b80ed171c4d2 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 24 Jul 2007 15:35:11 +0000 Subject: [PATCH] Fix clvmd if compiled with gulm support. (2.02.26) --- WHATS_NEW | 1 + daemons/clvmd/clvmd-gulm.c | 24 ++++++++++++------------ daemons/clvmd/clvmd-gulm.h | 10 +++++----- daemons/clvmd/tcp-comms.c | 4 ++-- daemons/clvmd/tcp-comms.h | 4 ++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index d03d80b95..42fb45d4f 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.28 - ================================ + Fix clvmd if compiled with gulm support. (2.02.26) Trivial fix to lvdisplay man page. Add vg_lock_and_read() external library function. Fix loading of persistent cache if cache_dir is used. (2.02.23) diff --git a/daemons/clvmd/clvmd-gulm.c b/daemons/clvmd/clvmd-gulm.c index 507cdfacf..3a230b5e3 100644 --- a/daemons/clvmd/clvmd-gulm.c +++ b/daemons/clvmd/clvmd-gulm.c @@ -86,12 +86,12 @@ struct lock_wait }; /* Forward */ -static int read_from_core_sock(struct local_client *client, char *buf, int len, char *csid, +static int read_from_core_sock(struct local_client *client, char *buf, int len, const char *csid, struct local_client **new_client); -static int read_from_lock_sock(struct local_client *client, char *buf, int len, char *csid, +static int read_from_lock_sock(struct local_client *client, char *buf, int len, const char *csid, struct local_client **new_client); static int get_all_cluster_nodes(void); -static int _csid_from_name(char *csid, char *name); +static int _csid_from_name(char *csid, const char *name); static void _cluster_closedown(void); /* In tcp-comms.c */ @@ -278,7 +278,7 @@ static void drop_expired_locks(char *nodename) } -static int read_from_core_sock(struct local_client *client, char *buf, int len, char *csid, +static int read_from_core_sock(struct local_client *client, char *buf, int len, const char *csid, struct local_client **new_client) { int status; @@ -288,7 +288,7 @@ static int read_from_core_sock(struct local_client *client, char *buf, int len, return status<0 ? status : 1; } -static int read_from_lock_sock(struct local_client *client, char *buf, int len, char *csid, +static int read_from_lock_sock(struct local_client *client, char *buf, int len, const char *csid, struct local_client **new_client) { int status; @@ -582,7 +582,7 @@ int get_next_node_csid(void **context, char *csid) return 1; } -int gulm_name_from_csid(char *csid, char *name) +int gulm_name_from_csid(const char *csid, char *name) { struct node_info *ninfo; @@ -598,7 +598,7 @@ int gulm_name_from_csid(char *csid, char *name) } -static int _csid_from_name(char *csid, char *name) +static int _csid_from_name(char *csid, const char *name) { struct dm_hash_node *hn; struct node_info *ninfo; @@ -622,7 +622,7 @@ static int _get_num_nodes() } /* Node is now known to be running a clvmd */ -void gulm_add_up_node(char *csid) +void gulm_add_up_node(const char *csid) { struct node_info *ninfo; @@ -661,7 +661,7 @@ void add_down_node(char *csid) /* Call a callback for each node, so the caller knows whether it's up or down */ static int _cluster_do_node_callback(struct local_client *master_client, - void (*callback)(struct local_client *, char *csid, int node_up)) + void (*callback)(struct local_client *, const char *csid, int node_up)) { struct dm_hash_node *hn; struct node_info *ninfo; @@ -965,14 +965,14 @@ static int _get_main_cluster_fd(void) return get_main_gulm_cluster_fd(); } -static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, char *csid, struct local_client **new_client) +static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, const char *csid, struct local_client **new_client) { return cluster_fd_gulm_callback(fd, buf, len, csid, new_client); } -static int _cluster_send_message(void *buf, int msglen, char *csid, const char *errtext) +static int _cluster_send_message(const void *buf, int msglen, const char *csid, const char *errtext) { - return gulm_cluster_send_message(buf, msglen, csid, errtext); + return gulm_cluster_send_message((char *)buf, msglen, csid, errtext); } static int _get_cluster_name(char *buf, int buflen) diff --git a/daemons/clvmd/clvmd-gulm.h b/daemons/clvmd/clvmd-gulm.h index bd2f0facc..d4be46fac 100644 --- a/daemons/clvmd/clvmd-gulm.h +++ b/daemons/clvmd/clvmd-gulm.h @@ -5,9 +5,9 @@ extern int get_next_node_csid(void **context, char *csid); extern void add_down_node(char *csid); extern int gulm_fd(void); -extern int get_ip_address(char *node, char *addr); -extern void tcp_remove_client(char *csid); -extern int alloc_client(int fd, char *csid, struct local_client **new_client); +extern int get_ip_address(const char *node, char *addr); +extern void tcp_remove_client(const char *csid); +extern int alloc_client(int fd, const char *csid, struct local_client **new_client); -void gulm_add_up_node(char *csid); -int gulm_name_from_csid(char *csid, char *name); +void gulm_add_up_node(const char *csid); +int gulm_name_from_csid(const char *csid, char *name); diff --git a/daemons/clvmd/tcp-comms.c b/daemons/clvmd/tcp-comms.c index 4c7f5b161..37e954ac2 100644 --- a/daemons/clvmd/tcp-comms.c +++ b/daemons/clvmd/tcp-comms.c @@ -177,7 +177,7 @@ int get_main_gulm_cluster_fd() /* Read on main comms (listen) socket, accept it */ -int cluster_fd_gulm_callback(struct local_client *fd, char *buf, int len, char *csid, +int cluster_fd_gulm_callback(struct local_client *fd, char *buf, int len, const char *csid, struct local_client **new_client) { int newfd; @@ -390,7 +390,7 @@ static int tcp_send_message(void *buf, int msglen, const char *csid, const char } -int gulm_cluster_send_message(void *buf, int msglen, char *csid, const char *errtext) +int gulm_cluster_send_message(void *buf, int msglen, const char *csid, const char *errtext) { int status=0; diff --git a/daemons/clvmd/tcp-comms.h b/daemons/clvmd/tcp-comms.h index d0ef29d5c..9260e1235 100644 --- a/daemons/clvmd/tcp-comms.h +++ b/daemons/clvmd/tcp-comms.h @@ -7,7 +7,7 @@ extern int init_comms(unsigned short); extern char *print_csid(const char *); int get_main_gulm_cluster_fd(void); -int cluster_fd_gulm_callback(struct local_client *fd, char *buf, int len, char *csid, struct local_client **new_client); -int gulm_cluster_send_message(void *buf, int msglen, char *csid, const char *errtext); +int cluster_fd_gulm_callback(struct local_client *fd, char *buf, int len, const char *csid, struct local_client **new_client); +int gulm_cluster_send_message(void *buf, int msglen, const char *csid, const char *errtext); void get_our_gulm_csid(char *csid); int gulm_connect_csid(const char *csid, struct local_client **newclient);