1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00

Fix compilation warning in clvmd.c

This commit is contained in:
Christine Caulfield 2009-08-13 10:39:41 +00:00
parent c808baef08
commit defed336ae
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.52 -
=================================
Fix compile warning in clvmd.
Version 2.02.51 - 6th August 2009
=================================

View File

@ -110,6 +110,8 @@ static int child_pipe[2];
typedef enum {IF_AUTO, IF_CMAN, IF_GULM, IF_OPENAIS, IF_COROSYNC} if_type_t;
typedef void *(lvm_pthread_fn_t)(void*);
/* Prototypes for code further down */
static void sigusr2_handler(int sig);
static void sighup_handler(int sig);
@ -138,7 +140,7 @@ static int check_all_clvmds_running(struct local_client *client);
static int local_rendezvous_callback(struct local_client *thisfd, char *buf,
int len, const char *csid,
struct local_client **new_client);
static void *lvm_thread_fn(void *);
static void lvm_thread_fn(void *) __attribute__ ((noreturn));
static int add_to_lvmqueue(struct local_client *client, struct clvm_header *msg,
int msglen, const char *csid);
static int distribute_command(struct local_client *thisfd);
@ -461,7 +463,7 @@ int main(int argc, char *argv[])
/* Don't let anyone else to do work until we are started */
pthread_mutex_lock(&lvm_start_mutex);
pthread_create(&lvm_thread, NULL, lvm_thread_fn,
pthread_create(&lvm_thread, NULL, (lvm_pthread_fn_t*)lvm_thread_fn,
(void *)(long)using_gulm);
/* Tell the rest of the cluster our version number */
@ -1797,7 +1799,7 @@ static int process_work_item(struct lvm_thread_cmd *cmd)
/*
* Routine that runs in the "LVM thread".
*/
static __attribute__ ((noreturn)) void *lvm_thread_fn(void *arg)
static void lvm_thread_fn(void *arg)
{
struct dm_list *cmdl, *tmp;
sigset_t ss;