From cb930ee7a00352a29e566ed563e57e1ad0979e47 Mon Sep 17 00:00:00 2001 From: neargye Date: Tue, 17 Nov 2026 16:50:48 +0400 Subject: [PATCH] Fix fuse loop hang when a read worker exits - DEFERs run in reverse order, so workers posted the semaphore before setting exited; the main loop could wake, see exited == 0 and wait again. With one read thread mergerfs then stayed running after unmount until signaled. - Set exited and post in a single DEFER, in that order. --- vendored/libfuse/lib/fuse_loop.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/vendored/libfuse/lib/fuse_loop.cpp b/vendored/libfuse/lib/fuse_loop.cpp index e6b3eec4..ed57c2d8 100644 --- a/vendored/libfuse/lib/fuse_loop.cpp +++ b/vendored/libfuse/lib/fuse_loop.cpp @@ -85,8 +85,12 @@ struct AsyncWorker void operator()() const { - DEFER{ fuse_session_exit(_se); }; - DEFER{ sem_post(_finished); }; + // Set exited before waking the main loop, which rechecks it. + DEFER + { + fuse_session_exit(_se); + sem_post(_finished); + }; ThreadPool::PToken ptok(_process_tp->ptoken()); while(!fuse_session_exited(_se)) @@ -149,8 +153,12 @@ struct SyncWorker void operator()() const { - DEFER{ fuse_session_exit(_se); }; - DEFER{ sem_post(_finished); }; + // Set exited before waking the main loop, which rechecks it. + DEFER + { + fuse_session_exit(_se); + sem_post(_finished); + }; while(!fuse_session_exited(_se)) {