From b33d3f0f10e36cdf5edb9a57b0ab2b2fa098cc02 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Fri, 18 Apr 2008 13:44:14 -0700
Subject: [PATCH] --- yaml --- r: 93005 b: refs/heads/master c:
 bf66737ca85c41442e99c9d380eb7807d88bac1f h: refs/heads/master i:   93003:
 6f9697d92c070599fd3e6153716e7ef514131cc4 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/jffs2/write.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4ceef90a520..3099b800fafe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ca646abb4503f39a7d235b89b9f8015e3ab4631
+refs/heads/master: bf66737ca85c41442e99c9d380eb7807d88bac1f
diff --git a/trunk/fs/jffs2/write.c b/trunk/fs/jffs2/write.c
index 776f13cbf2b5..beade550909c 100644
--- a/trunk/fs/jffs2/write.c
+++ b/trunk/fs/jffs2/write.c
@@ -582,9 +582,9 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
 		jffs2_add_fd_to_list(c, fd, &dir_f->dents);
 		up(&dir_f->sem);
 	} else {
-		struct jffs2_full_dirent *fd = dir_f->dents;
 		uint32_t nhash = full_name_hash(name, namelen);
 
+		fd = dir_f->dents;
 		/* We don't actually want to reserve any space, but we do
 		   want to be holding the alloc_sem when we write to flash */
 		down(&c->alloc_sem);