From 22d0d4275a693968eafed42a1656695fcddcea01 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 18 Feb 2013 14:43:08 +0100 Subject: Add "nopath" to help. --- lib/fuse.c | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/fuse.c b/lib/fuse.c index f404650..067d0dc 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -4417,6 +4417,7 @@ static void fuse_lib_help(void) " -o ac_attr_timeout=T auto cache timeout for attributes (attr_timeout)\n" " -o noforget never forget cached inodes\n" " -o remember=T remember cached inodes for T seconds (0s)\n" +" -o nopath don't supply path if not necessary\n" " -o intr allow requests to be interrupted\n" " -o intr_signal=NUM signal to send on interrupt (%i)\n" " -o modules=M1[:M2...] names of modules to push onto filesystem stack\n" -- cgit v1.2.3 From 44088bc7fbe7c9234c090756dbf10742b1a281b1 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 19 Mar 2013 17:16:14 +0100 Subject: libfuse: fix thread cancel race Exiting a worker my race with cancelling that same worker. This caused a segmenation fault. Reported and tested by Anatol Pomozov --- ChangeLog | 6 ++++++ lib/fuse_loop_mt.c | 2 ++ 2 files changed, 8 insertions(+) (limited to 'lib') diff --git a/ChangeLog b/ChangeLog index a163bd4..3afa404 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-03-19 Miklos Szeredi + + * libfuse: fix thread cancel race. Exiting a worker my race with + cancelling that same worker. This caused a segmenation + fault. Reported and tested by Anatol Pomozov + 2013-02-04 Miklos Szeredi * libfuse: fix crash in unlock_path(). Patch by Ratna Manoj diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c index 7ae5890..82e3001 100644 --- a/lib/fuse_loop_mt.c +++ b/lib/fuse_loop_mt.c @@ -241,9 +241,11 @@ int fuse_session_loop_mt(struct fuse_session *se) while (!fuse_session_exited(se)) sem_wait(&mt.finish); + pthread_mutex_lock(&mt.lock); 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); -- cgit v1.2.3