diff options
Diffstat (limited to 'fs/fuse/dev.c')
-rw-r--r-- | fs/fuse/dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index bc8a3846a4bf..609875dbd212 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
@@ -181,6 +181,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | |||
181 | */ | 181 | */ |
182 | static void request_end(struct fuse_conn *fc, struct fuse_req *req) | 182 | static void request_end(struct fuse_conn *fc, struct fuse_req *req) |
183 | { | 183 | { |
184 | list_del(&req->list); | ||
184 | req->state = FUSE_REQ_FINISHED; | 185 | req->state = FUSE_REQ_FINISHED; |
185 | spin_unlock(&fuse_lock); | 186 | spin_unlock(&fuse_lock); |
186 | if (req->background) { | 187 | if (req->background) { |
@@ -641,7 +642,7 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov, | |||
641 | 642 | ||
642 | req = list_entry(fc->pending.next, struct fuse_req, list); | 643 | req = list_entry(fc->pending.next, struct fuse_req, list); |
643 | req->state = FUSE_REQ_READING; | 644 | req->state = FUSE_REQ_READING; |
644 | list_del_init(&req->list); | 645 | list_move(&req->list, &fc->io); |
645 | 646 | ||
646 | in = &req->in; | 647 | in = &req->in; |
647 | reqsize = in->h.len; | 648 | reqsize = in->h.len; |
@@ -675,7 +676,7 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov, | |||
675 | request_end(fc, req); | 676 | request_end(fc, req); |
676 | else { | 677 | else { |
677 | req->state = FUSE_REQ_SENT; | 678 | req->state = FUSE_REQ_SENT; |
678 | list_add_tail(&req->list, &fc->processing); | 679 | list_move_tail(&req->list, &fc->processing); |
679 | spin_unlock(&fuse_lock); | 680 | spin_unlock(&fuse_lock); |
680 | } | 681 | } |
681 | return reqsize; | 682 | return reqsize; |
@@ -768,7 +769,6 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov, | |||
768 | if (!req) | 769 | if (!req) |
769 | goto err_unlock; | 770 | goto err_unlock; |
770 | 771 | ||
771 | list_del_init(&req->list); | ||
772 | if (req->interrupted) { | 772 | if (req->interrupted) { |
773 | spin_unlock(&fuse_lock); | 773 | spin_unlock(&fuse_lock); |
774 | fuse_copy_finish(&cs); | 774 | fuse_copy_finish(&cs); |
@@ -776,6 +776,7 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov, | |||
776 | request_end(fc, req); | 776 | request_end(fc, req); |
777 | return -ENOENT; | 777 | return -ENOENT; |
778 | } | 778 | } |
779 | list_move(&req->list, &fc->io); | ||
779 | req->out.h = oh; | 780 | req->out.h = oh; |
780 | req->locked = 1; | 781 | req->locked = 1; |
781 | cs.req = req; | 782 | cs.req = req; |
@@ -835,7 +836,6 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head) | |||
835 | while (!list_empty(head)) { | 836 | while (!list_empty(head)) { |
836 | struct fuse_req *req; | 837 | struct fuse_req *req; |
837 | req = list_entry(head->next, struct fuse_req, list); | 838 | req = list_entry(head->next, struct fuse_req, list); |
838 | list_del_init(&req->list); | ||
839 | req->out.h.error = -ECONNABORTED; | 839 | req->out.h.error = -ECONNABORTED; |
840 | request_end(fc, req); | 840 | request_end(fc, req); |
841 | spin_lock(&fuse_lock); | 841 | spin_lock(&fuse_lock); |