shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Log error state from pthread_join operation

Browse Source 
Value jstat is unused - so replace it with logging via log_sys_error().
This commit is contained in:
Zdenek Kabelac 2010-12-22 12:10:56 +00:00
parent fe71257ebd
commit 1febdf9a37
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.80 -
====================================
Log error message for pthread_join() failure in clvmd.
Version 2.02.79 - 20th December 2010
====================================

13
daemons/clvmd/clvmd.c
View File

@ -666,7 +666,6 @@ static int local_pipe_callback(struct local_client *thisfd, char *buf,
/* EOF on pipe or an error, close it */
if (len <= 0) {
int jstat;
void *ret = &status;
close(thisfd->fd);
@ -677,7 +676,9 @@ static int local_pipe_callback(struct local_client *thisfd, char *buf,
/* Reap child thread */
if (thisfd->bits.pipe.threadid) {
jstat = pthread_join(thisfd->bits.pipe.threadid, &ret);
if (pthread_join(thisfd->bits.pipe.threadid, &ret))
log_sys_error("pthread_join", "");
thisfd->bits.pipe.threadid = 0;
if (thisfd->bits.pipe.client != NULL)
thisfd->bits.pipe.client->bits.localsock.
@ -1041,7 +1042,6 @@ static int read_from_local_sock(struct local_client *thisfd)
/* EOF or error on socket */
if (len <= 0) {
int *status;
int jstat;
DEBUGLOG("EOF on local socket: inprogress=%d\n",
thisfd->bits.localsock.in_progress);
@ -1068,9 +1068,10 @@ static int read_from_local_sock(struct local_client *thisfd)
pthread_cond_signal(&thisfd->bits.localsock.cond);
pthread_mutex_unlock(&thisfd->bits.localsock.mutex);
jstat =
pthread_join(thisfd->bits.localsock.threadid,
(void **) &status);
if (pthread_join(thisfd->bits.localsock.threadid,
(void **) &status))
log_sys_error("pthread_join", "");
DEBUGLOG("Joined child thread\n");
thisfd->bits.localsock.threadid = 0;