fix

diff --git a/ChangeLog b/ChangeLog
index 15835f55cc575a11963cc7a26311bc785d8ee269..814289ad0645cdc4a4e5ab0c91954afad68c1cc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
-2005-03-05  Miklos Szeredi <miklos@szeredi.hu>
+2005-03-08  Miklos Szeredi <miklos@szeredi.hu>
 
        * Released 2.2.1
 
+2005-03-08  Miklos Szeredi <miklos@szeredi.hu>
+
+       * examples: add -lpthread to link flags to work around valgrind
+       quirk
+
+       * lib: don't exit threads, so cancelation doesn't cause segfault
+
 2005-03-04  Miklos Szeredi <miklos@szeredi.hu>
 
        * kernel: fix nasty bug which could cause an Oops under certain

diff --git a/example/Makefile.am b/example/Makefile.am
index 475cabf10854514aa363433779562245fb236bc5..e8c8a6dccc8ab270ccfc9b6c5af491047d98fda4 100644 (file)
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -6,4 +6,4 @@ fusexmp_SOURCES = fusexmp.c
 null_SOURCES = null.c
 hello_SOURCES = hello.c
 
-LDADD = ../lib/libfuse.la
+LDADD = ../lib/libfuse.la -lpthread

diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c
index 2e43671282e3290f569e438300c3c8f6b90d95ef..819a2b9c189751072a467692ac80e4cd25a3820b 100644 (file)
--- a/lib/fuse_mt.c
+++ b/lib/fuse_mt.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
+#include <unistd.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/time.h>
@@ -36,6 +37,7 @@ static void *do_work(void *data)
     struct fuse_worker *w = (struct fuse_worker *) data;
     struct fuse *f = w->f;
     struct fuse_context *ctx;
+    int is_mainthread = (f->numworker == 1);
 
     ctx = (struct fuse_context *) malloc(sizeof(struct fuse_context));
     if (ctx == NULL) {
@@ -83,6 +85,10 @@ static void *do_work(void *data)
         w->proc(w->f, cmd, w->data);
     }
 
+    /* Wait for cancellation */
+    if (!is_mainthread)
+        pause();
+
     return NULL;
 }