From b15fc86639bf9050c52cb42567227bb1e48d5c30 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 16 Oct 2007 23:31:04 -0700
Subject: [PATCH] --- yaml --- r: 70758 b: refs/heads/master c:
 819c4b3b4009275caae973691378235c177a1429 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f42abb50f9a4..f5add9e6a3fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebc14c4dbeb56195950058db9aa32de06c22de0d
+refs/heads/master: 819c4b3b4009275caae973691378235c177a1429
diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c
index de25bff31420..c78f60e1ba5d 100644
--- a/trunk/fs/fuse/dev.c
+++ b/trunk/fs/fuse/dev.c
@@ -231,8 +231,6 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
 		fc->num_background--;
 	}
 	spin_unlock(&fc->lock);
-	dput(req->dentry);
-	mntput(req->vfsmount);
 	wake_up(&req->waitq);
 	if (end)
 		end(fc, req);
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
index f3ef2bde983b..c4b98c03a46e 100644
--- a/trunk/fs/fuse/file.c
+++ b/trunk/fs/fuse/file.c
@@ -71,11 +71,19 @@ static struct fuse_file *fuse_file_get(struct fuse_file *ff)
 	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);
 	}