From eb96e734cda1be777f5795e0f16c16635fde476b Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 28 Apr 2009 16:56:36 +0200
Subject: [PATCH] --- yaml --- r: 147946 b: refs/heads/master c:
 b0be46ebf72ca7478c1c4bd0153c42f90e768a03 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/fuse/file.c   | 9 ++++-----
 trunk/fs/fuse/fuse_i.h | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a4c0fb2afde7..f4658fae4148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b2db28a7a2da1064df9e179d9b6d07b0bfe156a
+refs/heads/master: b0be46ebf72ca7478c1c4bd0153c42f90e768a03
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
index 028e17decf2f..3c8fa93524b0 100644
--- a/trunk/fs/fuse/file.c
+++ b/trunk/fs/fuse/file.c
@@ -86,15 +86,14 @@ static struct fuse_file *fuse_file_get(struct fuse_file *ff)
 
 static void fuse_release_end(struct fuse_conn *fc, struct fuse_req *req)
 {
-	dput(req->misc.release.dentry);
-	mntput(req->misc.release.vfsmount);
+	path_put(&req->misc.release.path);
 }
 
 static void fuse_file_put(struct fuse_file *ff)
 {
 	if (atomic_dec_and_test(&ff->count)) {
 		struct fuse_req *req = ff->reserved_req;
-		struct inode *inode = req->misc.release.dentry->d_inode;
+		struct inode *inode = req->misc.release.path.dentry->d_inode;
 		struct fuse_conn *fc = get_fuse_conn(inode);
 		req->end = fuse_release_end;
 		fuse_request_send_background(fc, req);
@@ -177,8 +176,8 @@ int fuse_release_common(struct inode *inode, struct file *file, int isdir)
 			  isdir ? FUSE_RELEASEDIR : FUSE_RELEASE);
 
 	/* Hold vfsmount and dentry until release is finished */
-	req->misc.release.vfsmount = mntget(file->f_path.mnt);
-	req->misc.release.dentry = dget(file->f_path.dentry);
+	path_get(&file->f_path);
+	req->misc.release.path = file->f_path;
 
 	spin_lock(&fc->lock);
 	list_del(&ff->write_entry);
diff --git a/trunk/fs/fuse/fuse_i.h b/trunk/fs/fuse/fuse_i.h
index 6fc5aedaa0d5..146317ff81b9 100644
--- a/trunk/fs/fuse/fuse_i.h
+++ b/trunk/fs/fuse/fuse_i.h
@@ -248,8 +248,7 @@ struct fuse_req {
 		struct fuse_forget_in forget_in;
 		struct {
 			struct fuse_release_in in;
-			struct vfsmount *vfsmount;
-			struct dentry *dentry;
+			struct path path;
 		} release;
 		struct fuse_init_in init_in;
 		struct fuse_init_out init_out;