From: Andrew Morton Date: Fri, 10 Aug 2007 21:01:30 +0000 (-0700) Subject: [JFFS2] fix printk warning in jffs2_block_check_erase() X-Git-Tag: firefly_0821_release~25980^2~32 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4e35647f5c0ac24ca1ba14f84bf817ec0483b72;p=firefly-linux-kernel-4.4.55.git [JFFS2] fix printk warning in jffs2_block_check_erase() fs/jffs2/erase.c: In function 'jffs2_block_check_erase': fs/jffs2/erase.c:355: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' and fs/jffs2/erase.c: In function 'jffs2_erase_pending_blocks': fs/jffs2/erase.c:404: warning: 'bad_offset' may be used uninitialized in this function Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse --- diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index efd83f33a806..addd3fc0e877 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c @@ -351,7 +351,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl } while(--retlen); c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size); if (retlen) - printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08x\n", + printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08tx\n", *wordebuf, jeb->offset + c->sector_size-retlen*sizeof(*wordebuf)); return 0; } @@ -401,7 +401,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb { size_t retlen; int ret; - uint32_t bad_offset; + uint32_t uninitialized_var(bad_offset); switch (jffs2_block_check_erase(c, jeb, &bad_offset)) { case -EAGAIN: goto refile;