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

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

[JFFS2] printk warning fixes 



fs/jffs2/wbuf.c: In function 'jffs2_check_oob_empty':
fs/jffs2/wbuf.c:993: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
fs/jffs2/wbuf.c:993: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
fs/jffs2/wbuf.c: In function 'jffs2_check_nand_cleanmarker':
fs/jffs2/wbuf.c:1036: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
fs/jffs2/wbuf.c:1036: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
fs/jffs2/wbuf.c: In function 'jffs2_write_nand_cleanmarker':
fs/jffs2/wbuf.c:1062: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
fs/jffs2/wbuf.c:1062: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 3a38d3af

fs/jffs2/wbuf.c

+9 −9
Original line number Diff line number Diff line
@@ -988,9 +988,9 @@ int jffs2_check_oob_empty(struct jffs2_sb_info *c, 


	ret = c->mtd->read_oob(c->mtd, jeb->offset, &ops);

	if (ret || ops.oobretlen != ops.ooblen) {

		printk(KERN_ERR "cannot read OOB for EB at %08x, requested %d "

				"bytes, read %d bytes, error %d\n", jeb->offset,

				ops.ooblen, ops.oobretlen, ret);

		printk(KERN_ERR "cannot read OOB for EB at %08x, requested %zd"

				" bytes, read %zd bytes, error %d\n",

				jeb->offset, ops.ooblen, ops.oobretlen, ret);

		if (!ret)

			ret = -EIO;

		return ret;
@@ -1031,9 +1031,9 @@ int jffs2_check_nand_cleanmarker(struct jffs2_sb_info *c, 


	ret = c->mtd->read_oob(c->mtd, jeb->offset, &ops);

	if (ret || ops.oobretlen != ops.ooblen) {

		printk(KERN_ERR "cannot read OOB for EB at %08x, requested %d "

				"bytes, read %d bytes, error %d\n", jeb->offset,

				ops.ooblen, ops.oobretlen, ret);

		printk(KERN_ERR "cannot read OOB for EB at %08x, requested %zd"

				" bytes, read %zd bytes, error %d\n",

				jeb->offset, ops.ooblen, ops.oobretlen, ret);

		if (!ret)

			ret = -EIO;

		return ret;
@@ -1057,9 +1057,9 @@ int jffs2_write_nand_cleanmarker(struct jffs2_sb_info *c, 


	ret = c->mtd->write_oob(c->mtd, jeb->offset, &ops);

	if (ret || ops.oobretlen != ops.ooblen) {

		printk(KERN_ERR "cannot write OOB for EB at %08x, requested %d "

				"bytes, read %d bytes, error %d\n", jeb->offset,

				ops.ooblen, ops.oobretlen, ret);

		printk(KERN_ERR "cannot write OOB for EB at %08x, requested %zd"

				" bytes, read %zd bytes, error %d\n",

				jeb->offset, ops.ooblen, ops.oobretlen, ret);

		if (!ret)

			ret = -EIO;

		return ret;