diff --git a/[refs] b/[refs]
index e5fd00144b0d..aaa68557d3d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 722d2bea8c601d0744e4a37170533fdf6214a678
+refs/heads/master: 3c18ef8117f0515b1e455713dfc2e18b06db9bb5
diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c
index 367310588962..be5c7e13320c 100644
--- a/trunk/fs/fuse/dev.c
+++ b/trunk/fs/fuse/dev.c
@@ -379,7 +379,7 @@ __releases(fc->lock)
 			fc->blocked = 0;
 
 		/* Wake up next waiter, if any */
-		if (!fc->blocked)
+		if (!fc->blocked && waitqueue_active(&fc->blocked_waitq))
 			wake_up(&fc->blocked_waitq);
 
 		if (fc->num_background == fc->congestion_threshold &&