5 files changed, 45 insertions, 111 deletions

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index e4ada021d08..d4c869c6d01 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -103,20 +103,9 @@ static struct fuse_req *do_get_request(struct fuse_conn *fc)
         return req;
 }
 
+/* This can return NULL, but only in case it's interrupted by a SIGKILL */
 struct fuse_req *fuse_get_request(struct fuse_conn *fc)
 {
-        if (down_interruptible(&fc->outstanding_sem))
-                return NULL;
-        return do_get_request(fc);
-}
-
-/*
- * Non-interruptible version of the above function is for operations
- * which can't legally return -ERESTART{SYS,NOINTR}.  This can still
- * return NULL, but only in case the signal is SIGKILL.
- */
-struct fuse_req *fuse_get_request_nonint(struct fuse_conn *fc)
-{
         int intr;
         sigset_t oldset;
 
@@ -241,43 +230,20 @@ static void background_request(struct fuse_conn *fc, struct fuse_req *req)
                 get_file(req->file);
 }
 
-static int request_wait_answer_nonint(struct fuse_req *req)
-{
-        int err;
-        sigset_t oldset;
-        block_sigs(&oldset);
-        err = wait_event_interruptible(req->waitq, req->finished);
-        restore_sigs(&oldset);
-        return err;
-}
-
 /* Called with fuse_lock held.  Releases, and then reacquires it. */
-static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req,
-                                int interruptible)
+static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
 {
-        int intr;
+        sigset_t oldset;
 
         spin_unlock(&fuse_lock);
-        if (interruptible)
-                intr = wait_event_interruptible(req->waitq, req->finished);
-        else
-                intr = request_wait_answer_nonint(req);
+        block_sigs(&oldset);
+        wait_event_interruptible(req->waitq, req->finished);
+        restore_sigs(&oldset);
         spin_lock(&fuse_lock);
-        if (intr && interruptible && req->sent) {
-                /* If request is already in userspace, only allow KILL
-                   signal to interrupt */
-                spin_unlock(&fuse_lock);
-                intr = request_wait_answer_nonint(req);
-                spin_lock(&fuse_lock);
-        }
-        if (!intr)
+        if (req->finished)
                 return;
 
-        if (!interruptible || req->sent)
-                req->out.h.error = -EINTR;
-        else
-                req->out.h.error = -ERESTARTNOINTR;
-
+        req->out.h.error = -EINTR;
         req->interrupted = 1;
         if (req->locked) {
                 /* This is uninterruptible sleep, because data is
@@ -330,8 +296,10 @@ static void queue_request(struct fuse_conn *fc, struct fuse_req *req)
         wake_up(&fc->waitq);
 }
 
-static void request_send_wait(struct fuse_conn *fc, struct fuse_req *req,
-                              int interruptible)
+/*
+ * This can only be interrupted by a SIGKILL
+ */
+void request_send(struct fuse_conn *fc, struct fuse_req *req)
 {
         req->isreply = 1;
         spin_lock(&fuse_lock);
@@ -345,26 +313,11 @@ static void request_send_wait(struct fuse_conn *fc, struct fuse_req *req,
                    after request_end() */
                 __fuse_get_request(req);
 
-                request_wait_answer(fc, req, interruptible);
+                request_wait_answer(fc, req);
         }
         spin_unlock(&fuse_lock);
 }
 
-void request_send(struct fuse_conn *fc, struct fuse_req *req)
-{
-        request_send_wait(fc, req, 1);
-}
-
-/*
- * Non-interruptible version of the above function is for operations
- * which can't legally return -ERESTART{SYS,NOINTR}.  This can still
- * be interrupted but only with SIGKILL.
- */
-void request_send_nonint(struct fuse_conn *fc, struct fuse_req *req)
-{
-        request_send_wait(fc, req, 0);
-}
-
 static void request_send_nowait(struct fuse_conn *fc, struct fuse_req *req)
 {
         spin_lock(&fuse_lock);
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 73792d65b6c..e79e49b3eec 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -46,12 +46,12 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
                 struct inode *inode = entry->d_inode;
                 struct fuse_inode *fi = get_fuse_inode(inode);
                 struct fuse_conn *fc = get_fuse_conn(inode);
-                struct fuse_req *req = fuse_get_request_nonint(fc);
+                struct fuse_req *req = fuse_get_request(fc);
                 if (!req)
                         return 0;
 
                 fuse_lookup_init(req, entry->d_parent->d_inode, entry, &outarg);
-                request_send_nonint(fc, req);
+                request_send(fc, req);
                 err = req->out.h.error;
                 if (!err) {
                         if (outarg.nodeid != get_node_id(inode)) {
@@ -91,7 +91,7 @@ static int fuse_lookup_iget(struct inode *dir, struct dentry *entry,
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         fuse_lookup_init(req, dir, entry, &outarg);
         request_send(fc, req);
@@ -185,7 +185,7 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode,
         struct fuse_conn *fc = get_fuse_conn(dir);
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.mode = mode;
@@ -211,7 +211,7 @@ static int fuse_mkdir(struct inode *dir, struct dentry *entry, int mode)
         struct fuse_conn *fc = get_fuse_conn(dir);
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.mode = mode;
@@ -236,7 +236,7 @@ static int fuse_symlink(struct inode *dir, struct dentry *entry,
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         req->in.h.opcode = FUSE_SYMLINK;
         req->in.numargs = 2;
@@ -253,7 +253,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
         struct fuse_conn *fc = get_fuse_conn(dir);
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         req->in.h.opcode = FUSE_UNLINK;
         req->in.h.nodeid = get_node_id(dir);
@@ -284,7 +284,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
         struct fuse_conn *fc = get_fuse_conn(dir);
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         req->in.h.opcode = FUSE_RMDIR;
         req->in.h.nodeid = get_node_id(dir);
@@ -311,7 +311,7 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,
         struct fuse_conn *fc = get_fuse_conn(olddir);
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.newdir = get_node_id(newdir);
@@ -356,7 +356,7 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
         struct fuse_conn *fc = get_fuse_conn(inode);
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.oldnodeid = get_node_id(inode);
@@ -386,7 +386,7 @@ int fuse_do_getattr(struct inode *inode)
         struct fuse_conn *fc = get_fuse_conn(inode);
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         req->in.h.opcode = FUSE_GETATTR;
         req->in.h.nodeid = get_node_id(inode);
@@ -533,7 +533,7 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir)
         struct page *page;
         struct inode *inode = file->f_dentry->d_inode;
         struct fuse_conn *fc = get_fuse_conn(inode);
-        struct fuse_req *req = fuse_get_request_nonint(fc);
+        struct fuse_req *req = fuse_get_request(fc);
         if (!req)
                 return -EINTR;
 
@@ -564,7 +564,7 @@ static char *read_link(struct dentry *dentry)
         char *link;
 
         if (!req)
-                return ERR_PTR(-ERESTARTNOINTR);
+                return ERR_PTR(-EINTR);
 
         link = (char *) __get_free_page(GFP_KERNEL);
         if (!link) {
@@ -677,7 +677,7 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.valid = iattr_to_fattr(attr, &inarg.attr);
@@ -761,7 +761,7 @@ static int fuse_setxattr(struct dentry *entry, const char *name,
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.size = size;
@@ -801,7 +801,7 @@ static ssize_t fuse_getxattr(struct dentry *entry, const char *name,
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.size = size;
@@ -851,7 +851,7 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.size = size;
@@ -897,7 +897,7 @@ static int fuse_removexattr(struct dentry *entry, const char *name)
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTNOINTR;
+                return -EINTR;
 
         req->in.h.opcode = FUSE_REMOVEXATTR;
         req->in.h.nodeid = get_node_id(inode);
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index e225f8c0b26..6454022b053 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -22,9 +22,6 @@ int fuse_open_common(struct inode *inode, struct file *file, int isdir)
         struct fuse_open_out outarg;
         struct fuse_file *ff;
         int err;
-        /* Restarting the syscall is not allowed if O_CREAT and O_EXCL
-           are both set, because creation will fail on the restart */
-        int excl = (file->f_flags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL);
 
         err = generic_file_open(inode, file);
         if (err)
@@ -38,12 +35,9 @@ int fuse_open_common(struct inode *inode, struct file *file, int isdir)
                         return err;
         }
 
-        if (excl)
-                req = fuse_get_request_nonint(fc);
-        else
-                req = fuse_get_request(fc);
+        req = fuse_get_request(fc);
         if (!req)
-                return excl ? -EINTR : -ERESTARTSYS;
+                return -EINTR;
 
         err = -ENOMEM;
         ff = kmalloc(sizeof(struct fuse_file), GFP_KERNEL);
@@ -67,10 +61,7 @@ int fuse_open_common(struct inode *inode, struct file *file, int isdir)
         req->out.numargs = 1;
         req->out.args[0].size = sizeof(outarg);
         req->out.args[0].value = &outarg;
-        if (excl)
-                request_send_nonint(fc, req);
-        else
-                request_send(fc, req);
+        request_send(fc, req);
         err = req->out.h.error;
         if (err) {
                 fuse_request_free(ff->release_req);
@@ -133,7 +124,7 @@ static int fuse_flush(struct file *file)
         if (fc->no_flush)
                 return 0;
 
-        req = fuse_get_request_nonint(fc);
+        req = fuse_get_request(fc);
         if (!req)
                 return -EINTR;
 
@@ -146,7 +137,7 @@ static int fuse_flush(struct file *file)
         req->in.numargs = 1;
         req->in.args[0].size = sizeof(inarg);
         req->in.args[0].value = &inarg;
-        request_send_nonint(fc, req);
+        request_send(fc, req);
         err = req->out.h.error;
         fuse_put_request(fc, req);
         if (err == -ENOSYS) {
@@ -171,7 +162,7 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTSYS;
+                return -EINTR;
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.fh = ff->fh;
@@ -224,7 +215,7 @@ size_t fuse_send_read_common(struct fuse_req *req, struct file *file,
         req->out.argvar = 1;
         req->out.numargs = 1;
         req->out.args[0].size = count;
-        request_send_nonint(fc, req);
+        request_send(fc, req);
         return req->out.args[0].size;
 }
 
@@ -240,7 +231,7 @@ static int fuse_readpage(struct file *file, struct page *page)
         struct inode *inode = page->mapping->host;
         struct fuse_conn *fc = get_fuse_conn(inode);
         loff_t pos = (loff_t) page->index << PAGE_CACHE_SHIFT;
-        struct fuse_req *req = fuse_get_request_nonint(fc);
+        struct fuse_req *req = fuse_get_request(fc);
         int err = -EINTR;
         if (!req)
                 goto out;
@@ -314,7 +305,7 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
         int err;
         data.file = file;
         data.inode = inode;
-        data.req = fuse_get_request_nonint(fc);
+        data.req = fuse_get_request(fc);
         if (!data.req)
                 return -EINTR;
 
@@ -350,7 +341,7 @@ static size_t fuse_send_write(struct fuse_req *req, struct file *file,
         req->out.numargs = 1;
         req->out.args[0].size = sizeof(struct fuse_write_out);
         req->out.args[0].value = &outarg;
-        request_send_nonint(fc, req);
+        request_send(fc, req);
         return outarg.size;
 }
 
@@ -370,7 +361,7 @@ static int fuse_commit_write(struct file *file, struct page *page,
         struct inode *inode = page->mapping->host;
         struct fuse_conn *fc = get_fuse_conn(inode);
         loff_t pos = ((loff_t) page->index << PAGE_CACHE_SHIFT) + offset;
-        struct fuse_req *req = fuse_get_request_nonint(fc);
+        struct fuse_req *req = fuse_get_request(fc);
         if (!req)
                 return -EINTR;
 
@@ -444,7 +435,7 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
         ssize_t res = 0;
         struct fuse_req *req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTSYS;
+                return -EINTR;
 
         while (count) {
                 size_t tmp;
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index d7647289d8a..24d761518d8 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -410,27 +410,17 @@ void fuse_reset_request(struct fuse_req *req);
 struct fuse_req *fuse_get_request(struct fuse_conn *fc);
 
 /**
- * Reserve a preallocated request, only interruptible by SIGKILL
- */
-struct fuse_req *fuse_get_request_nonint(struct fuse_conn *fc);
-
-/**
  * Decrement reference count of a request.  If count goes to zero put
  * on unused list (preallocated) or free reqest (not preallocated).
  */
 void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req);
 
 /**
- * Send a request (synchronous, interruptible)
+ * Send a request (synchronous)
  */
 void request_send(struct fuse_conn *fc, struct fuse_req *req);
 
 /**
- * Send a request (synchronous, non-interruptible except by SIGKILL)
- */
-void request_send_nonint(struct fuse_conn *fc, struct fuse_req *req);
-
-/**
  * Send a request with no reply
  */
 void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req);
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 52e954f4bb9..e69a546844d 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -236,7 +236,7 @@ static int fuse_statfs(struct super_block *sb, struct kstatfs *buf)
 
         req = fuse_get_request(fc);
         if (!req)
-                return -ERESTARTSYS;
+                return -EINTR;
 
         req->in.numargs = 0;
         req->in.h.opcode = FUSE_STATFS;