From: David Goulet <david.goulet@polymtl.ca>
Date: Wed, 20 Jul 2011 21:18:58 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre2~12
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=059008c7017e1148c77e4ec7050227f80300c5bd;hp=36c0262a92b315ba2c20ea4c5f56ba0f94538c3c;p=lttng-tools.git

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

diff --git a/liblttkconsumerd/liblttkconsumerd.c b/liblttkconsumerd/liblttkconsumerd.c
index 99bf30eb4..1e86d28d0 100644
--- a/liblttkconsumerd/liblttkconsumerd.c
+++ b/liblttkconsumerd/liblttkconsumerd.c
@@ -124,7 +124,6 @@ static int kconsumerd_find_session_fd(int fd)
 	cds_list_for_each_entry(iter, &kconsumerd_data.fd_list.head, list) {
 		if (iter->sessiond_fd == fd) {
 			DBG("Duplicate session fd %d", fd);
-			pthread_mutex_unlock(&kconsumerd_data.lock);
 			return 1;
 		}
 	}