[JFFS2] fix sparse warning in write.c

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=bf66737ca85c41442e99c9d380eb7807d88bac1f
Commit:     bf66737ca85c41442e99c9d380eb7807d88bac1f
Parent:     8ca646abb4503f39a7d235b89b9f8015e3ab4631
Author:     Harvey Harrison <harvey.harrison at gmail.com>
AuthorDate: Fri Apr 18 13:44:14 2008 -0700
Committer:  David Woodhouse <dwmw2 at infradead.org>
CommitDate: Tue Apr 22 12:35:46 2008 +0100

    [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 at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
---
 fs/jffs2/write.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c
index 776f13c..beade55 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);