[PATCH] fuse: clean up request accounting

FUSE allocated most requests from a fixed size pool filled at mount time.
However in some cases (release/forget) non-pool requests were used.  File
locking operations aren't well served by the request pool, since they may
block indefinetly thus exhausting the pool.

This patch removes the request pool and always allocates requests on demand.

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, 24 insertions, 24 deletions

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 3ac39c0288de..e4f041a11bb5 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -22,9 +22,9 @@ static int fuse_send_open(struct inode *inode, struct file *file, int isdir,
         struct fuse_req *req;
         int err;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.flags = file->f_flags & ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
@@ -184,9 +184,9 @@ static int fuse_flush(struct file *file)
         if (fc->no_flush)
                 return 0;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.fh = ff->fh;
@@ -223,9 +223,9 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,
         if ((!isdir && fc->no_fsync) || (isdir && fc->no_fsyncdir))
                 return 0;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.fh = ff->fh;
@@ -297,9 +297,9 @@ static int fuse_readpage(struct file *file, struct page *page)
         if (is_bad_inode(inode))
                 goto out;
 
-        err = -EINTR;
-        req = fuse_get_request(fc);
-        if (!req)
+        req = fuse_get_req(fc);
+        err = PTR_ERR(req);
+        if (IS_ERR(req))
                 goto out;
 
         req->out.page_zeroing = 1;
@@ -368,10 +368,10 @@ static int fuse_readpages_fill(void *_data, struct page *page)
              (req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_read ||
              req->pages[req->num_pages - 1]->index + 1 != page->index)) {
                 fuse_send_readpages(req, data->file, inode);
-                data->req = req = fuse_get_request(fc);
-                if (!req) {
+                data->req = req = fuse_get_req(fc);
+                if (IS_ERR(req)) {
                         unlock_page(page);
-                        return -EINTR;
+                        return PTR_ERR(req);
                 }
         }
         req->pages[req->num_pages] = page;
@@ -392,9 +392,9 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
 
         data.file = file;
         data.inode = inode;
-        data.req = fuse_get_request(fc);
-        if (!data.req)
-                return -EINTR;
+        data.req = fuse_get_req(fc);
+        if (IS_ERR(data.req))
+                return PTR_ERR(data.req);
 
         err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data);
         if (!err) {
@@ -455,9 +455,9 @@ static int fuse_commit_write(struct file *file, struct page *page,
         if (is_bad_inode(inode))
                 return -EIO;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         req->num_pages = 1;
         req->pages[0] = page;
@@ -532,9 +532,9 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
         if (is_bad_inode(inode))
                 return -EIO;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         while (count) {
                 size_t nres;