aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2012-01-02 18:15:05 +0100
committerMiklos Szeredi <mszeredi@suse.cz>2012-01-02 18:15:05 +0100
commit6c4cc1e64d9fee2fc7e38c0afa36f82b25dca69c (patch)
tree0636bee8af1a425387407972fe1bd10c125d05a6
parent3c4f7e194e247a369b2e6748e5b8d5a5e212855c (diff)
downloadandroid_external_fuse-6c4cc1e64d9fee2fc7e38c0afa36f82b25dca69c.tar.gz
android_external_fuse-6c4cc1e64d9fee2fc7e38c0afa36f82b25dca69c.tar.bz2
android_external_fuse-6c4cc1e64d9fee2fc7e38c0afa36f82b25dca69c.zip
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 404c81f..0cda4f8 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 b5ad1c7..7ae5890 100644
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
@@ -244,7 +244,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);