From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Fri, 18 Apr 2008 20:44:14 +0000 (-0700)
Subject: [JFFS2] fix sparse warning in write.c
X-Git-Tag: firefly_0821_release~21546^2~66
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bf66737ca85c41442e99c9d380eb7807d88bac1f;p=firefly-linux-kernel-4.4.55.git

[JFFS2] fix sparse warning in write.c

fs/jffs2/write.c:585:28: warning: symbol 'fd' shadows an earlier one
fs/jffs2/write.c:536:27: originally declared here

No need to redeclare fd, use the original one, after this point,
fd is always reassigned before it used again.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c
index 776f13cbf2b5..beade550909c 100644
--- a/fs/jffs2/write.c
+++ b/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);