[JFFS2] Fix printk format in some error messages.

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Mon May 15 08:59:02 EDT 2006


Commit:     184f565210c6c8a852c53ffc070f9add61e0f331
Parent:     3e68fbb59b3d4e6b47b65e9928b5929e02179759
Author:     Andrew Morton <akpm at osdl.org>
AuthorDate: Mon May 15 13:45:58 2006 +0100
Commit:     David Woodhouse <dwmw2 at infradead.org>
CommitDate: Mon May 15 13:45:58 2006 +0100

    [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 at osdl.org>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

 fs/jffs2/nodelist.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index d4d0c41..7d71593 100644
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -438,7 +438,7 @@ #ifndef __ECOS
 	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 @@ #endif
 		}
 
 		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;
 		}




More information about the linux-mtd-cvs mailing list