diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2007-10-16 16:11:01 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-10-16 16:11:01 +0000 |
| commit | a32865d843466cb66724f211a813a844e380930e (patch) | |
| tree | a30d4589ed02d1fed2e2a9e9bc762bcf6b564656 /kernel/dev.c | |
| parent | 7d62647d7aebffe76837b0698e8dc22f439f1ab6 (diff) | |
| download | libfuse-a32865d843466cb66724f211a813a844e380930e.tar.gz | |
pull kernel module fixes from mainline
Diffstat (limited to 'kernel/dev.c')
| -rw-r--r-- | kernel/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/dev.c b/kernel/dev.c index 60a6bbf..f8b7f3a 100644 --- a/kernel/dev.c +++ b/kernel/dev.c @@ -131,7 +131,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; @@ -157,7 +157,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); } |