Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4e35647 authored by Andrew Morton's avatar Andrew Morton Committed by David Woodhouse
Browse files

[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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 9ed437c5

fs/jffs2/erase.c

+2 −2
Original line number Diff line number Diff line
@@ -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;