From ffdc6a1e881e46130f6b4d8b14af7c0628858fe2 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 16 Oct 2007 23:31:00 -0700
Subject: [PATCH] --- yaml --- r: 70751 b: refs/heads/master c:
 de5e3dec421c44c999071b8f7e0580ad2ade92ae h: refs/heads/master i:   70749:
 dc264dd21d336d534af3a157c8de1a0e4a814586   70747:
 2d14433a917bcf3f5e30ce1e6c6562aa45ba010d   70743:
 8d97dbe0ba9b270eae947262b03760cc2be29aa0   70735:
 c33e5593ad9aeb60f8108baf426ead425e5ecef4   70719:
 b8bfced711ca008cc5f1d194e652aeb1fe3f6e69 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/fuse/dev.c    | 4 ++--
 trunk/fs/fuse/fuse_i.h | 3 +++
 trunk/fs/fuse/inode.c  | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6d3c9e81b1c2..2e76b9e0dec0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f92b99b9dccb61760b345baf40ed37f59b91f8af
+refs/heads/master: de5e3dec421c44c999071b8f7e0580ad2ade92ae
diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c
index ebc36f525eee..9c9e35e42bfd 100644
--- a/trunk/fs/fuse/dev.c
+++ b/trunk/fs/fuse/dev.c
@@ -129,7 +129,7 @@ static struct fuse_req *get_reserved_req(struct fuse_conn *fc,
 	struct fuse_file *ff = file->private_data;
 
 	do {
-		wait_event(fc->blocked_waitq, ff->reserved_req);
+		wait_event(fc->reserved_req_waitq, ff->reserved_req);
 		spin_lock(&fc->lock);
 		if (ff->reserved_req) {
 			req = ff->reserved_req;
@@ -155,7 +155,7 @@ static void put_reserved_req(struct fuse_conn *fc, struct fuse_req *req)
 	fuse_request_init(req);
 	BUG_ON(ff->reserved_req);
 	ff->reserved_req = req;
-	wake_up(&fc->blocked_waitq);
+	wake_up_all(&fc->reserved_req_waitq);
 	spin_unlock(&fc->lock);
 	fput(file);
 }
diff --git a/trunk/fs/fuse/fuse_i.h b/trunk/fs/fuse/fuse_i.h
index 9f4603beb9e8..95bcb433d1b4 100644
--- a/trunk/fs/fuse/fuse_i.h
+++ b/trunk/fs/fuse/fuse_i.h
@@ -289,6 +289,9 @@ struct fuse_conn {
 	/** waitq for blocked connection */
 	wait_queue_head_t blocked_waitq;
 
+	/** waitq for reserved requests */
+	wait_queue_head_t reserved_req_waitq;
+
 	/** The next unique request id */
 	u64 reqctr;
 
diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c
index 807988445685..95c8a9738ca7 100644
--- a/trunk/fs/fuse/inode.c
+++ b/trunk/fs/fuse/inode.c
@@ -232,6 +232,7 @@ static void fuse_put_super(struct super_block *sb)
 	kill_fasync(&fc->fasync, SIGIO, POLL_IN);
 	wake_up_all(&fc->waitq);
 	wake_up_all(&fc->blocked_waitq);
+	wake_up_all(&fc->reserved_req_waitq);
 	mutex_lock(&fuse_mutex);
 	list_del(&fc->entry);
 	fuse_ctl_remove_conn(fc);
@@ -410,6 +411,7 @@ static struct fuse_conn *new_conn(void)
 		atomic_set(&fc->count, 1);
 		init_waitqueue_head(&fc->waitq);
 		init_waitqueue_head(&fc->blocked_waitq);
+		init_waitqueue_head(&fc->reserved_req_waitq);
 		INIT_LIST_HEAD(&fc->pending);
 		INIT_LIST_HEAD(&fc->processing);
 		INIT_LIST_HEAD(&fc->io);