summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2012-01-02 18:15:05 +0100
committerMiklos Szeredi <mszeredi@suse.cz>2012-01-25 17:05:12 +0100
commit207a784b3556ec70261110b8ca10d8a762d9e3bc (patch)
tree884b11c03dc20bc8745aaf83d3ba165b32106ac4
parent3743f3fe52cfd52bb1d75bcb8324a00f153dc9f8 (diff)
downloadfuse-207a784b3556ec70261110b8ca10d8a762d9e3bc.tar.gz
Remove unnecessary mutex unlock at the end of multithreaded event loop
-rw-r--r--ChangeLog5
-rw-r--r--lib/fuse_loop_mt.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c25c0b..91b52eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-02 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Remove unnecessary mutex unlock at the end of multithreaded
+ event loop.
+
2011-12-09 Miklos Szeredi <miklos@szeredi.hu>
* Fix hang in wait_on_path(). Reported by Ville Silventoinen
diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
index 05935d5..037bd86 100644
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
@@ -224,7 +224,6 @@ int fuse_session_loop_mt(struct fuse_session *se)
for (w = mt.main.next; w != &mt.main; w = w->next)
pthread_cancel(w->thread_id);
mt.exit = 1;
- pthread_mutex_unlock(&mt.lock);
while (mt.main.next != &mt.main)
fuse_join_worker(&mt, mt.main.next);