From: Harvey Harrison fs/jffs2/nodemgmt.c:60:8: warning: symbol 'ret' shadows an earlier one fs/jffs2/nodemgmt.c:45:6: originally declared here Use a different var (gc) in the inner loop to test the condition. Signed-off-by: Harvey Harrison Cc: David Woodhouse Signed-off-by: Andrew Morton --- fs/jffs2/nodemgmt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN fs/jffs2/nodemgmt.c~jffs2-fix-sparse-warning-in-nodemgmtc fs/jffs2/nodemgmt.c --- a/fs/jffs2/nodemgmt.c~jffs2-fix-sparse-warning-in-nodemgmtc +++ a/fs/jffs2/nodemgmt.c @@ -57,7 +57,7 @@ int jffs2_reserve_space(struct jffs2_sb_ /* this needs a little more thought (true :)) */ while(ret == -EAGAIN) { while(c->nr_free_blocks + c->nr_erasing_blocks < blocksneeded) { - int ret; + int gc; uint32_t dirty, avail; /* calculate real dirty size @@ -116,9 +116,9 @@ int jffs2_reserve_space(struct jffs2_sb_ c->free_size + c->dirty_size + c->wasted_size + c->used_size + c->erasing_size + c->bad_size, c->flash_size)); spin_unlock(&c->erase_completion_lock); - ret = jffs2_garbage_collect_pass(c); - if (ret) - return ret; + gc = jffs2_garbage_collect_pass(c); + if (gc) + return gc; cond_resched(); _