[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 <akpm@linux-foundation.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
committed by
David Woodhouse
parent
9ed437c50d
commit
f4e35647f5
@@ -351,7 +351,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl
|
|||||||
} while(--retlen);
|
} while(--retlen);
|
||||||
c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size);
|
c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size);
|
||||||
if (retlen)
|
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));
|
*wordebuf, jeb->offset + c->sector_size-retlen*sizeof(*wordebuf));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -401,7 +401,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
|
|||||||
{
|
{
|
||||||
size_t retlen;
|
size_t retlen;
|
||||||
int ret;
|
int ret;
|
||||||
uint32_t bad_offset;
|
uint32_t uninitialized_var(bad_offset);
|
||||||
|
|
||||||
switch (jffs2_block_check_erase(c, jeb, &bad_offset)) {
|
switch (jffs2_block_check_erase(c, jeb, &bad_offset)) {
|
||||||
case -EAGAIN: goto refile;
|
case -EAGAIN: goto refile;
|
||||||
|
Reference in New Issue
Block a user