diff --git a/WHATS_NEW b/WHATS_NEW index a85d31d65..21cc39665 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -5,6 +5,8 @@ Version 2.01.07 - 8th March 2005 clvmd fixes: make FDs close-on-exec gulm unlocks VG & orphan locks at startup in case they are stale gulm now unlocks VG & orphan locks if client dies. + Don't take out lvm thread lock at startup, it only protects the + jobs list. Version 2.01.06 - 1st March 2005 ================================ diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index 880f4a3b1..cd33adbd4 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -1598,7 +1598,6 @@ static void *lvm_thread_fn(void *arg) int using_gulm = (int)arg; DEBUGLOG("LVM thread function started\n"); - pthread_mutex_lock(&lvm_thread_mutex); /* Ignore SIGUSR1 & 2 */ sigemptyset(&ss); @@ -1608,7 +1607,6 @@ static void *lvm_thread_fn(void *arg) /* Initialise the interface to liblvm */ init_lvm(using_gulm); - pthread_mutex_unlock(&lvm_thread_mutex); /* Now wait for some actual work */ for (;;) { diff --git a/daemons/clvmd/clvmd.h b/daemons/clvmd/clvmd.h index fd59062cf..e4203552a 100644 --- a/daemons/clvmd/clvmd.h +++ b/daemons/clvmd/clvmd.h @@ -95,7 +95,7 @@ struct local_client { }; #ifdef DEBUG -#define DEBUGLOG(fmt, args...) fprintf(stderr, "CLVMD[%d]: %ld ", getpid(), time(NULL) ); fprintf(stderr, fmt, ## args) +#define DEBUGLOG(fmt, args...) fprintf(stderr, "CLVMD[%x]: %ld ", (int)pthread_self(), time(NULL) ); fprintf(stderr, fmt, ## args) #else #define DEBUGLOG(fmt, args...) #endif