diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-23 22:32:16 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-23 22:32:16 +0000 |
| commit | a25d4c2e7ea3741c5cf44d17d955c9bae91ca128 (patch) | |
| tree | d269cd16628e5ceddf1f9c3693223d40e4fdace2 /kernel/dev.c | |
| parent | 72cf5c9d9eced708d212db49a9ae9f261b8cfcd9 (diff) | |
| download | libfuse-a25d4c2e7ea3741c5cf44d17d955c9bae91ca128.tar.gz | |
various fixes
Diffstat (limited to 'kernel/dev.c')
| -rw-r--r-- | kernel/dev.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/kernel/dev.c b/kernel/dev.c index 7261770..da41e59 100644 --- a/kernel/dev.c +++ b/kernel/dev.c @@ -8,6 +8,7 @@ #include "fuse_i.h" +#include <linux/init.h> #include <linux/module.h> #include <linux/poll.h> #ifdef KERNEL_2_6 @@ -261,7 +262,6 @@ static ssize_t fuse_dev_read(struct file *file, char __user *buf, else if (!list_empty(&fc->pending)) { req = list_entry(fc->pending.next, struct fuse_req, list); list_del_init(&req->list); - req->locked = 1; } spin_unlock(&fuse_lock); if (!fc) @@ -275,12 +275,9 @@ static ssize_t fuse_dev_read(struct file *file, char __user *buf, if (ret < 0) { req->out.h.error = -EPROTO; req->finished = 1; - } else { + } else list_add_tail(&req->list, &fc->processing); - req->sent = 1; - } - req->locked = 0; - if (ret < 0 || req->interrupted) + if (ret < 0) /* Unlocks fuse_lock: */ request_end(fc, req); else @@ -471,10 +468,8 @@ static ssize_t fuse_dev_write(struct file *file, const char __user *buf, spin_lock(&fuse_lock); req = request_find(fc, oh.unique); - if (req != NULL) { + if (req != NULL) list_del_init(&req->list); - req->locked = 1; - } spin_unlock(&fuse_lock); if (!req) return -ENOENT; @@ -491,7 +486,6 @@ static ssize_t fuse_dev_write(struct file *file, const char __user *buf, process_getdir(req); } req->finished = 1; - req->locked = 0; /* Unlocks fuse_lock: */ request_end(fc, req); @@ -565,7 +559,6 @@ struct file_operations fuse_dev_operations = { }; #ifdef KERNEL_2_6 -#define FUSE_MINOR MISC_DYNAMIC_MINOR #ifndef FUSE_MAINLINE static decl_subsys(fs, NULL, NULL); |