Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse update from Miklos Szeredi:
 "The first part makes sure we don't hold up umount with pending async
  requests.  In addition to being a cleanup, this is a small behavioral
  change (for the better) and unlikely to break anything.

  The second part prepares for a cleanup of the fuse device I/O code by
  adding a helper for simple request submission, with some savings in
  line numbers already realized"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: use file_inode() in fuse_file_fallocate()
  fuse: introduce fuse_simple_request() helper
  fuse: reduce max out args
  fuse: hold inode instead of path after release
  fuse: flush requests on umount
  fuse: don't wake up reserved req in fuse_conn_kill()

6 files changed, 359 insertions, 524 deletions

diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
index 966ace8b243f..28d0c7abba1c 100644
--- a/fs/fuse/cuse.c
+++ b/fs/fuse/cuse.c
@@ -415,7 +415,7 @@ err_unlock:
 err_region:
         unregister_chrdev_region(devt, 1);
 err:
-        fuse_conn_kill(fc);
+        fuse_abort_conn(fc);
         goto out;
 }
 
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index ca887314aba9..ba1107977f2e 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -511,6 +511,35 @@ void fuse_request_send(struct fuse_conn *fc, struct fuse_req *req)
 }
 EXPORT_SYMBOL_GPL(fuse_request_send);
 
+ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)
+{
+        struct fuse_req *req;
+        ssize_t ret;
+
+        req = fuse_get_req(fc, 0);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
+
+        req->in.h.opcode = args->in.h.opcode;
+        req->in.h.nodeid = args->in.h.nodeid;
+        req->in.numargs = args->in.numargs;
+        memcpy(req->in.args, args->in.args,
+               args->in.numargs * sizeof(struct fuse_in_arg));
+        req->out.argvar = args->out.argvar;
+        req->out.numargs = args->out.numargs;
+        memcpy(req->out.args, args->out.args,
+               args->out.numargs * sizeof(struct fuse_arg));
+        fuse_request_send(fc, req);
+        ret = req->out.h.error;
+        if (!ret && args->out.argvar) {
+                BUG_ON(args->out.numargs != 1);
+                ret = req->out.args[0].size;
+        }
+        fuse_put_request(fc, req);
+
+        return ret;
+}
+
 static void fuse_request_send_nowait_locked(struct fuse_conn *fc,
                                             struct fuse_req *req)
 {
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index df562cc87763..252b8a5de8b5 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -145,22 +145,22 @@ static void fuse_invalidate_entry(struct dentry *entry)
         fuse_invalidate_entry_cache(entry);
 }
 
-static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_req *req,
+static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args,
                              u64 nodeid, struct qstr *name,
                              struct fuse_entry_out *outarg)
 {
         memset(outarg, 0, sizeof(struct fuse_entry_out));
-        req->in.h.opcode = FUSE_LOOKUP;
-        req->in.h.nodeid = nodeid;
-        req->in.numargs = 1;
-        req->in.args[0].size = name->len + 1;
-        req->in.args[0].value = name->name;
-        req->out.numargs = 1;
+        args->in.h.opcode = FUSE_LOOKUP;
+        args->in.h.nodeid = nodeid;
+        args->in.numargs = 1;
+        args->in.args[0].size = name->len + 1;
+        args->in.args[0].value = name->name;
+        args->out.numargs = 1;
         if (fc->minor < 9)
-                req->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
+                args->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
         else
-                req->out.args[0].size = sizeof(struct fuse_entry_out);
-        req->out.args[0].value = outarg;
+                args->out.args[0].size = sizeof(struct fuse_entry_out);
+        args->out.args[0].value = outarg;
 }
 
 u64 fuse_get_attr_version(struct fuse_conn *fc)
@@ -200,9 +200,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
                 goto invalid;
         else if (time_before64(fuse_dentry_time(entry), get_jiffies_64()) ||
                  (flags & LOOKUP_REVAL)) {
-                int err;
                 struct fuse_entry_out outarg;
-                struct fuse_req *req;
+                FUSE_ARGS(args);
                 struct fuse_forget_link *forget;
                 u64 attr_version;
 
@@ -215,31 +214,23 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
                         goto out;
 
                 fc = get_fuse_conn(inode);
-                req = fuse_get_req_nopages(fc);
-                ret = PTR_ERR(req);
-                if (IS_ERR(req))
-                        goto out;
 
                 forget = fuse_alloc_forget();
-                if (!forget) {
-                        fuse_put_request(fc, req);
-                        ret = -ENOMEM;
+                ret = -ENOMEM;
+                if (!forget)
                         goto out;
-                }
 
                 attr_version = fuse_get_attr_version(fc);
 
                 parent = dget_parent(entry);
-                fuse_lookup_init(fc, req, get_node_id(parent->d_inode),
+                fuse_lookup_init(fc, &args, get_node_id(parent->d_inode),
                                  &entry->d_name, &outarg);
-                fuse_request_send(fc, req);
+                ret = fuse_simple_request(fc, &args);
                 dput(parent);
-                err = req->out.h.error;
-                fuse_put_request(fc, req);
                 /* Zero nodeid is same as -ENOENT */
-                if (!err && !outarg.nodeid)
-                        err = -ENOENT;
-                if (!err) {
+                if (!ret && !outarg.nodeid)
+                        ret = -ENOENT;
+                if (!ret) {
                         fi = get_fuse_inode(inode);
                         if (outarg.nodeid != get_node_id(inode)) {
                                 fuse_queue_forget(fc, forget, outarg.nodeid, 1);
@@ -250,7 +241,9 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
                         spin_unlock(&fc->lock);
                 }
                 kfree(forget);
-                if (err || (outarg.attr.mode ^ inode->i_mode) & S_IFMT)
+                if (ret == -ENOMEM)
+                        goto out;
+                if (ret || (outarg.attr.mode ^ inode->i_mode) & S_IFMT)
                         goto invalid;
 
                 fuse_change_attributes(inode, &outarg.attr,
@@ -296,7 +289,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name,
                      struct fuse_entry_out *outarg, struct inode **inode)
 {
         struct fuse_conn *fc = get_fuse_conn_super(sb);
-        struct fuse_req *req;
+        FUSE_ARGS(args);
         struct fuse_forget_link *forget;
         u64 attr_version;
         int err;
@@ -306,24 +299,16 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name,
         if (name->len > FUSE_NAME_MAX)
                 goto out;
 
-        req = fuse_get_req_nopages(fc);
-        err = PTR_ERR(req);
-        if (IS_ERR(req))
-                goto out;
 
         forget = fuse_alloc_forget();
         err = -ENOMEM;
-        if (!forget) {
+        if (!forget)