aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/inode.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2007-10-17 02:31:00 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:03 -0400
commitde5e3dec421c44c999071b8f7e0580ad2ade92ae (patch)
treec327562a78335346704c382c5b220b13c9208589 /fs/fuse/inode.c
parentf92b99b9dccb61760b345baf40ed37f59b91f8af (diff)
fuse: fix reserved request wake up
Use wake_up_all instead of wake_up in put_reserved_req(), otherwise it is possible that the right task is not woken up. Also create a separate reserved_req_waitq in addition to the blocked_waitq, since they fulfill totally separate functions. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r--fs/fuse/inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 807988445685..95c8a9738ca7 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -232,6 +232,7 @@ static void fuse_put_super(struct super_block *sb)
232 kill_fasync(&fc->fasync, SIGIO, POLL_IN); 232 kill_fasync(&fc->fasync, SIGIO, POLL_IN);
233 wake_up_all(&fc->waitq); 233 wake_up_all(&fc->waitq);
234 wake_up_all(&fc->blocked_waitq); 234 wake_up_all(&fc->blocked_waitq);
235 wake_up_all(&fc->reserved_req_waitq);
235 mutex_lock(&fuse_mutex); 236 mutex_lock(&fuse_mutex);
236 list_del(&fc->entry); 237 list_del(&fc->entry);
237 fuse_ctl_remove_conn(fc); 238 fuse_ctl_remove_conn(fc);
@@ -410,6 +411,7 @@ static struct fuse_conn *new_conn(void)
410 atomic_set(&fc->count, 1); 411 atomic_set(&fc->count, 1);
411 init_waitqueue_head(&fc->waitq); 412 init_waitqueue_head(&fc->waitq);
412 init_waitqueue_head(&fc->blocked_waitq); 413 init_waitqueue_head(&fc->blocked_waitq);
414 init_waitqueue_head(&fc->reserved_req_waitq);
413 INIT_LIST_HEAD(&fc->pending); 415 INIT_LIST_HEAD(&fc->pending);
414 INIT_LIST_HEAD(&fc->processing); 416 INIT_LIST_HEAD(&fc->processing);
415 INIT_LIST_HEAD(&fc->io); 417 INIT_LIST_HEAD(&fc->io);