Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=842398a32b2a74... Commit: 842398a32b2a74631c0a350a3c06794b91e7c34c Parent: 3e62b5680e917955df9bcb2ca627b0a656fe5b52 Author: Ryan McCabe rmccabe@redhat.com AuthorDate: Fri Jul 12 15:42:45 2013 -0400 Committer: Ryan McCabe rmccabe@redhat.com CommitterDate: Wed Jul 17 10:49:05 2013 -0400
rgmanger: Don't destroy locked mutexes
Unlock locked mutexes before calling pthread_mutex_destroy() on them.
Related: rhbz#983296
Signed-off-by: Ryan McCabe rmccabe@redhat.com --- rgmanager/src/clulib/libcpglock.c | 1 + rgmanager/src/daemons/rg_thread.c | 18 +++++------------- 2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/rgmanager/src/clulib/libcpglock.c b/rgmanager/src/clulib/libcpglock.c index f99edd4..75fc9f6 100644 --- a/rgmanager/src/clulib/libcpglock.c +++ b/rgmanager/src/clulib/libcpglock.c @@ -279,6 +279,7 @@ cpg_lock_fin(void *handle)
close(h->fd);
+ pthread_mutex_unlock(&h->mutex); pthread_mutex_destroy(&h->mutex); free(h); return 0; diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c index b888717..c08d8aa 100644 --- a/rgmanager/src/daemons/rg_thread.c +++ b/rgmanager/src/daemons/rg_thread.c @@ -530,20 +530,12 @@ resgroup_thread_main(void *arg) raise(SIGSEGV); }
+ pthread_mutex_unlock(&my_queue_mutex); mystatus = pthread_mutex_destroy(&my_queue_mutex); - if (mystatus != 0) - { - if (mystatus == EBUSY) { - pthread_mutex_unlock(&my_queue_mutex); - } - - mystatus = pthread_mutex_destroy(&my_queue_mutex); - if (mystatus != 0) { - fprintf (stderr, "mutex_destroy=%d err=%d %p\n", - mystatus, errno, &my_queue_mutex); - - fflush (stderr); - } + if (mystatus != 0) { + fprintf(stderr, "mutex_destroy=%d err=%d %p\n", + mystatus, errno, &my_queue_mutex); + fflush (stderr); }
list_remove(&resthread_list, myself);
cluster-commits@lists.fedorahosted.org