diff options
Diffstat (limited to 'fs/fuse/dev.c')
| -rw-r--r-- | fs/fuse/dev.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 4e1144a38438..f2c7dd90ebfc 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -376,18 +376,13 @@ static void flush_bg_queue(struct fuse_conn *fc) * was closed. The requester thread is woken up (if still waiting), * the 'end' callback is called if given, else the reference to the * request is released - * - * Called with fc->lock, unlocks it */ static void request_end(struct fuse_conn *fc, struct fuse_req *req) -__releases(fc->lock) { struct fuse_iqueue *fiq = &fc->iq; - if (test_and_set_bit(FR_FINISHED, &req->flags)) { - spin_unlock(&fc->lock); + if (test_and_set_bit(FR_FINISHED, &req->flags)) return; - } spin_lock(&fiq->waitq.lock); list_del_init(&req->intr_entry); @@ -395,6 +390,7 @@ __releases(fc->lock) WARN_ON(test_bit(FR_PENDING, &req->flags)); WARN_ON(test_bit(FR_SENT, &req->flags)); if (test_bit(FR_BACKGROUND, &req->flags)) { + spin_lock(&fc->lock); clear_bit(FR_BACKGROUND, &req->flags); if (fc->num_background == fc->max_background) fc->blocked = 0; @@ -411,8 +407,8 @@ __releases(fc->lock) fc->num_background--; fc->active_background--; flush_bg_queue(fc); + spin_unlock(&fc->lock); } - spin_unlock(&fc->lock); wake_up(&req->waitq); if (req->end) req->end(fc, req); @@ -1290,6 +1286,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, /* SETXATTR is special, since it may contain too large data */ if (in->h.opcode == FUSE_SETXATTR) req->out.h.error = -E2BIG; + spin_unlock(&fc->lock); request_end(fc, req); goto restart; } @@ -1333,6 +1330,7 @@ out_end: if (!test_bit(FR_PRIVATE, &req->flags)) list_del_init(&req->list); spin_unlock(&fpq->lock); + spin_unlock(&fc->lock); request_end(fc, req); return err; @@ -1951,6 +1949,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc, if (!test_bit(FR_PRIVATE, &req->flags)) list_del_init(&req->list); spin_unlock(&fpq->lock); + spin_unlock(&fc->lock); request_end(fc, req); return err ? err : nbytes; @@ -2095,6 +2094,7 @@ __acquires(fc->lock) clear_bit(FR_PENDING, &req->flags); clear_bit(FR_SENT, &req->flags); list_del_init(&req->list); + spin_unlock(&fc->lock); request_end(fc, req); spin_lock(&fc->lock); } @@ -2177,6 +2177,7 @@ void fuse_abort_conn(struct fuse_conn *fc) req = list_first_entry(&to_end1, struct fuse_req, list); __fuse_get_request(req); list_del_init(&req->list); + spin_unlock(&fc->lock); request_end(fc, req); spin_lock(&fc->lock); } |