1 files changed, 24 insertions, 19 deletions

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index c78f60e1ba5d..cc6c2908fb12 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -273,28 +273,41 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
                         queue_interrupt(fc, req);
         }
 
-        if (req->force) {
-                spin_unlock(&fc->lock);
-                wait_event(req->waitq, req->state == FUSE_REQ_FINISHED);
-                spin_lock(&fc->lock);
-        } else {
+        if (!req->force) {
                 sigset_t oldset;
 
                 /* Only fatal signals may interrupt this */
                 block_sigs(&oldset);
                 wait_answer_interruptible(fc, req);
                 restore_sigs(&oldset);
+
+                if (req->aborted)
+                        goto aborted;
+                if (req->state == FUSE_REQ_FINISHED)
+                        return;
+
+                /* Request is not yet in userspace, bail out */
+                if (req->state == FUSE_REQ_PENDING) {
+                        list_del(&req->list);
+                        __fuse_put_request(req);
+                        req->out.h.error = -EINTR;
+                        return;
+                }
         }
 
-        if (req->aborted)
-                goto aborted;
-        if (req->state == FUSE_REQ_FINISHED)
-                return;
+        /*
+         * Either request is already in userspace, or it was forced.
+         * Wait it out.
+         */
+        spin_unlock(&fc->lock);
+        wait_event(req->waitq, req->state == FUSE_REQ_FINISHED);
+        spin_lock(&fc->lock);
 
-        req->out.h.error = -EINTR;
-        req->aborted = 1;
+        if (!req->aborted)
+                return;
 
  aborted:
+        BUG_ON(req->state != FUSE_REQ_FINISHED);
         if (req->locked) {
                 /* This is uninterruptible sleep, because data is
                    being copied to/from the buffers of req.  During
@@ -305,14 +318,6 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
                 wait_event(req->waitq, !req->locked);
                 spin_lock(&fc->lock);
         }
-        if (req->state == FUSE_REQ_PENDING) {
-                list_del(&req->list);
-                __fuse_put_request(req);
-        } else if (req->state == FUSE_REQ_SENT) {
-                spin_unlock(&fc->lock);
-                wait_event(req->waitq, req->state == FUSE_REQ_FINISHED);
-                spin_lock(&fc->lock);
-        }
 }
 
 static unsigned len_args(unsigned numargs, struct fuse_arg *args)