[Pkg-libvirt-commits] [libguestfs] 126/156: df: unlock retire_mutex on early exit

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 0525de750baa2a921b523cfd6eec82bcaf0fea72
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Fri Aug 8 17:13:02 2014 +0200

    df: unlock retire_mutex on early exit
    
    If pthread_cond_wait fails and the thread worker ends, make sure to
    unlock retire_mutex, which has been locked for the condition.
    
    The return value of pthread_mutex_unlock is ignored, as there's nothing
    that can be done with it at that point.
    
    (cherry picked from commit a26a9e68819dab5f9c8eed821d8a686fffabbc5b)
---
 df/parallel.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/df/parallel.c b/df/parallel.c
index 047735e..6d2e1cf 100644
--- a/df/parallel.c
+++ b/df/parallel.c
@@ -33,6 +33,8 @@
 #include <libvirt/virterror.h>
 #endif
 
+#include "ignore-value.h"
+
 #include "guestfs.h"
 #include "guestfs-internal-frontend.h"
 #include "options.h"
@@ -224,6 +226,7 @@ worker_thread (void *thread_data_vp)
       if (err != 0) {
         thread_failure ("pthread_cond_wait", err);
         thread_data->r = -1;
+        ignore_value (pthread_mutex_unlock (&retire_mutex));
         return &thread_data->r;
       }
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git