diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-18 16:44:14 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:35:46 -0400 |
commit | bf66737ca85c41442e99c9d380eb7807d88bac1f (patch) | |
tree | 94ba4c0c6e59c61181364c65929fd7ba8ff074d6 /fs | |
parent | 8ca646abb4503f39a7d235b89b9f8015e3ab4631 (diff) |
[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>
Diffstat (limited to 'fs')
-rw-r--r-- | 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 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, | |||
582 | jffs2_add_fd_to_list(c, fd, &dir_f->dents); | 582 | jffs2_add_fd_to_list(c, fd, &dir_f->dents); |
583 | up(&dir_f->sem); | 583 | up(&dir_f->sem); |
584 | } else { | 584 | } else { |
585 | struct jffs2_full_dirent *fd = dir_f->dents; | ||
586 | uint32_t nhash = full_name_hash(name, namelen); | 585 | uint32_t nhash = full_name_hash(name, namelen); |
587 | 586 | ||
587 | fd = dir_f->dents; | ||
588 | /* We don't actually want to reserve any space, but we do | 588 | /* We don't actually want to reserve any space, but we do |
589 | want to be holding the alloc_sem when we write to flash */ | 589 | want to be holding the alloc_sem when we write to flash */ |
590 | down(&c->alloc_sem); | 590 | down(&c->alloc_sem); |