From: Miklos Szeredi <mszeredi@suse.cz>
Move dput/mntput pair from request_end() to fuse_release_end(),
because there's no other place they are used.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
Index: linux/fs/fuse/dev.c
===================================================================
--- linux.orig/fs/fuse/dev.c 2007-08-03 18:36:01.000000000 +0200
+++ linux/fs/fuse/dev.c 2007-08-03 18:37:24.000000000 +0200
@@ -231,8 +231,6 @@ static void request_end(struct fuse_conn
fc->num_background--;
}
spin_unlock(&fc->lock);
- dput(req->dentry);
- mntput(req->vfsmount);
wake_up(&req->waitq);
if (end)
end(fc, req);
Index: linux/fs/fuse/file.c
===================================================================
--- linux.orig/fs/fuse/file.c 2007-08-03 18:36:15.000000000 +0200
+++ linux/fs/fuse/file.c 2007-08-03 18:37:24.000000000 +0200
@@ -71,11 +71,19 @@ static struct fuse_file *fuse_file_get(s
return ff;
}
+static void fuse_release_end(struct fuse_conn *fc, struct fuse_req *req)
+{
+ dput(req->dentry);
+ mntput(req->vfsmount);
+ fuse_put_request(fc, req);
+}
+
static void fuse_file_put(struct fuse_file *ff)
{
if (atomic_dec_and_test(&ff->count)) {
struct fuse_req *req = ff->reserved_req;
struct fuse_conn *fc = get_fuse_conn(req->dentry->d_inode);
+ req->end = fuse_release_end;
request_send_background(fc, req);
kfree(ff);
}
--
-
