[PATCH] FUSE: don't allow restarting of system calls

This patch removes ability to interrupt and restart operations while there
hasn't been any side-effect.

The reason: applications.  There are some apps it seems that generate
signals at a fast rate.  This means, that if the operation cannot make
enough progress between two signals, it will be restarted for ever.  This
bug actually manifested itself with 'krusader' trying to open a file for
writing under sshfs.  Thanks to Eduard Czimbalmos for the report.

The problem can be solved just by making open() uninterruptible, because in
this case it was the truncate operation that slowed down the progress.  But
it's better to solve this by simply not allowing interrupts at all (except
SIGKILL), because applications don't expect file operations to be
interruptible anyway.  As an added bonus the code is simplified somewhat.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 12 insertions, 21 deletions

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index e225f8c0b267..6454022b0536 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;