From a70ee317e8cc969f9195cba4976b35823305f878 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 14 Nov 2007 17:00:02 -0800
Subject: [PATCH] --- yaml --- r: 73716 b: refs/heads/master c:
 8744969a819de4ee5158f4cdb30104601cc015d4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fc09f6030fb8..3a686fd2d460 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be21f0ab0d8f10c90265066603a8d95b6037a6fa
+refs/heads/master: 8744969a819de4ee5158f4cdb30104601cc015d4
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
index 0fcdba9d47c0..535b37399009 100644
--- a/trunk/fs/fuse/file.c
+++ b/trunk/fs/fuse/file.c
@@ -55,9 +55,10 @@ struct fuse_file *fuse_file_alloc(void)
 		if (!ff->reserved_req) {
 			kfree(ff);
 			ff = NULL;
+		} else {
+			INIT_LIST_HEAD(&ff->write_entry);
+			atomic_set(&ff->count, 0);
 		}
-		INIT_LIST_HEAD(&ff->write_entry);
-		atomic_set(&ff->count, 0);
 	}
 	return ff;
 }