From: Harvey Harrison fs/jffs2/gc.c:1147:29: warning: symbol 'jeb' shadows an earlier one fs/jffs2/gc.c:1084:89: originally declared here fs/jffs2/gc.c:1197:29: warning: symbol 'jeb' shadows an earlier one fs/jffs2/gc.c:1084:89: originally declared here Add an sb_ prefix to the inner jeb variables as they are taken from the super_blocks list. It appears jffs2_garbage_collect_dnode never uses its jeb argument, so as an alternative that could be dropped and the one caller adusted then the inner variables would not need to be touched. Signed-off-by: Harvey Harrison Cc: David Woodhouse Signed-off-by: Andrew Morton --- fs/jffs2/gc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff -puN fs/jffs2/gc.c~jffs2-fix-sparse-warnings-in-gcc fs/jffs2/gc.c --- a/fs/jffs2/gc.c~jffs2-fix-sparse-warnings-in-gcc +++ a/fs/jffs2/gc.c @@ -1144,24 +1144,24 @@ static int jffs2_garbage_collect_dnode(s If not, cover it anyway. */ struct jffs2_raw_node_ref *raw = frag->node->raw; - struct jffs2_eraseblock *jeb; + struct jffs2_eraseblock *sb_jeb; - jeb = &c->blocks[raw->flash_offset / c->sector_size]; + sb_jeb = &c->blocks[raw->flash_offset / c->sector_size]; - if (jeb == c->gcblock) { + if (sb_jeb == c->gcblock) { D1(printk(KERN_DEBUG "Expanding down to cover frag (0x%x-0x%x) in gcblock at %08x\n", frag->ofs, frag->ofs+frag->size, ref_offset(raw))); start = frag->ofs; break; } - if (!ISDIRTY(jeb->dirty_size + jeb->wasted_size)) { + if (!ISDIRTY(sb_jeb->dirty_size + sb_jeb->wasted_size)) { D1(printk(KERN_DEBUG "Not expanding down to cover frag (0x%x-0x%x) in clean block %08x\n", - frag->ofs, frag->ofs+frag->size, jeb->offset)); + frag->ofs, frag->ofs+frag->size, sb_jeb->offset)); break; } D1(printk(KERN_DEBUG "Expanding down to cover frag (0x%x-0x%x) in dirty block %08x\n", - frag->ofs, frag->ofs+frag->size, jeb->offset)); + frag->ofs, frag->ofs+frag->size, sb_jeb->offset)); start = frag->ofs; break; } @@ -1194,24 +1194,24 @@ static int jffs2_garbage_collect_dnode(s If not, cover it anyway. */ struct jffs2_raw_node_ref *raw = frag->node->raw; - struct jffs2_eraseblock *jeb; + struct jffs2_eraseblock *sb_jeb; - jeb = &c->blocks[raw->flash_offset / c->sector_size]; + sb_jeb = &c->blocks[raw->flash_offset / c->sector_size]; - if (jeb == c->gcblock) { + if (sb_jeb == c->gcblock) { D1(printk(KERN_DEBUG "Expanding up to cover frag (0x%x-0x%x) in gcblock at %08x\n", frag->ofs, frag->ofs+frag->size, ref_offset(raw))); end = frag->ofs + frag->size; break; } - if (!ISDIRTY(jeb->dirty_size + jeb->wasted_size)) { + if (!ISDIRTY(sb_jeb->dirty_size + sb_jeb->wasted_size)) { D1(printk(KERN_DEBUG "Not expanding up to cover frag (0x%x-0x%x) in clean block %08x\n", - frag->ofs, frag->ofs+frag->size, jeb->offset)); + frag->ofs, frag->ofs+frag->size, sb_jeb->offset)); break; } D1(printk(KERN_DEBUG "Expanding up to cover frag (0x%x-0x%x) in dirty block %08x\n", - frag->ofs, frag->ofs+frag->size, jeb->offset)); + frag->ofs, frag->ofs+frag->size, sb_jeb->offset)); end = frag->ofs + frag->size; break; } _