aboutsummaryrefslogtreecommitdiffstats
path: root/lib/fuse_lowlevel.c
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2006-09-02 09:51:08 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2006-09-02 09:51:08 +0000
commitfa44077613d10cf3606d3e3f845585904f6c44a7 (patch)
tree0f0d28170cfb03b3a20e48ff58b2ecb7c78f8ea7 /lib/fuse_lowlevel.c
parent9ae10b743e945487e12e8377b8f9fe49d8a745ab (diff)
downloadlibfuse-fa44077613d10cf3606d3e3f845585904f6c44a7.tar.gz
fix
Diffstat (limited to 'lib/fuse_lowlevel.c')
-rw-r--r--lib/fuse_lowlevel.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 677ef79..cd1e571 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -868,20 +868,25 @@ static void do_interrupt(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
pthread_mutex_unlock(&f->lock);
}
-static void check_interrupt(struct fuse_ll *f, struct fuse_req *req)
+static struct fuse_req *check_interrupt(struct fuse_ll *f, struct fuse_req *req)
{
struct fuse_req *curr;
for (curr = f->interrupts.next; curr != &f->interrupts; curr = curr->next) {
if (curr->u.i.unique == req->unique) {
+ req->interrupted = 1;
list_del_req(curr);
free(curr);
- return;
+ return NULL;
}
}
curr = f->interrupts.next;
- if (curr != &f->interrupts)
- fuse_reply_err(curr, EAGAIN);
+ if (curr != &f->interrupts) {
+ list_del_req(curr);
+ list_init_req(curr);
+ return curr;
+ } else
+ return NULL;
}
static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
@@ -1062,10 +1067,13 @@ static void fuse_ll_process(void *data, const char *buf, size_t len,
fuse_reply_err(req, ENOSYS);
else {
if (in->opcode != FUSE_INTERRUPT) {
+ struct fuse_req *intr;
pthread_mutex_lock(&f->lock);
- check_interrupt(f, req);
+ intr = check_interrupt(f, req);
list_add_req(req, &f->list);
pthread_mutex_unlock(&f->lock);
+ if (intr)
+ fuse_reply_err(intr, EAGAIN);
}
fuse_ll_ops[in->opcode].func(req, in->nodeid, inarg);
}