Commit 184f5652 authored May 15, 2006 by Andrew Morton Committed by David Woodhouse May 15, 2006

[JFFS2] Fix printk format in some error messages.



fs/jffs2/nodelist.c: In function `check_node_data':
fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4)
fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5)

Modified from Andrew's original fix because while his terminal may indeed
only have eighty columns, mine only has _TWENTYFOUR_ lines. So the
cosmetic fluff is perfectly OK out past column 80 where it was -- the
casual reader doesn't _care_ about anything more than the fact that it
goes 'if (foo) JFFS2_WARNING...', and there's no point wasting a whole
line to display the tail end of the printk which nobody actually cares
about.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

parent 3e68fbb5

fs/jffs2/nodelist.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -438,7 +438,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
		if (c->mtd->point) {
		err = c->mtd->point(c->mtd, ofs, len, &retlen, &buffer);
		if (!err && retlen < tn->csize) {
		JFFS2_WARNING("MTD point returned len too short: %u instead of %u.\n", retlen, tn->csize);
		JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn->csize);
		c->mtd->unpoint(c->mtd, buffer, ofs, len);
		} else if (err)
		JFFS2_WARNING("MTD point failed: error code %d.\n", err);
		@@ -461,7 +461,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
		}

		if (retlen != len) {
		JFFS2_ERROR("short read at %#08x: %d instead of %d.\n", ofs, retlen, len);
		JFFS2_ERROR("short read at %#08x: %zd instead of %d.\n", ofs, retlen, len);
		err = -EIO;
		goto free_out;
		}

Admin message