diff options
Diffstat (limited to 'fs/jffs2/summary.c')
-rw-r--r-- | fs/jffs2/summary.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c index e537fb0e0184..c522d098bb4f 100644 --- a/fs/jffs2/summary.c +++ b/fs/jffs2/summary.c | |||
@@ -11,6 +11,8 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
15 | |||
14 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
15 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
16 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
@@ -442,13 +444,16 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras | |||
442 | /* This should never happen, but https://dev.laptop.org/ticket/4184 */ | 444 | /* This should never happen, but https://dev.laptop.org/ticket/4184 */ |
443 | checkedlen = strnlen(spd->name, spd->nsize); | 445 | checkedlen = strnlen(spd->name, spd->nsize); |
444 | if (!checkedlen) { | 446 | if (!checkedlen) { |
445 | printk(KERN_ERR "Dirent at %08x has zero at start of name. Aborting mount.\n", | 447 | pr_err("Dirent at %08x has zero at start of name. Aborting mount.\n", |
446 | jeb->offset + je32_to_cpu(spd->offset)); | 448 | jeb->offset + |
449 | je32_to_cpu(spd->offset)); | ||
447 | return -EIO; | 450 | return -EIO; |
448 | } | 451 | } |
449 | if (checkedlen < spd->nsize) { | 452 | if (checkedlen < spd->nsize) { |
450 | printk(KERN_ERR "Dirent at %08x has zeroes in name. Truncating to %d chars\n", | 453 | pr_err("Dirent at %08x has zeroes in name. Truncating to %d chars\n", |
451 | jeb->offset + je32_to_cpu(spd->offset), checkedlen); | 454 | jeb->offset + |
455 | je32_to_cpu(spd->offset), | ||
456 | checkedlen); | ||
452 | } | 457 | } |
453 | 458 | ||
454 | 459 | ||
@@ -808,8 +813,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock | |||
808 | 813 | ||
809 | sum_ofs = jeb->offset + c->sector_size - jeb->free_size; | 814 | sum_ofs = jeb->offset + c->sector_size - jeb->free_size; |
810 | 815 | ||
811 | dbg_summary("JFFS2: writing out data to flash to pos : 0x%08x\n", | 816 | dbg_summary("writing out data to flash to pos : 0x%08x\n", sum_ofs); |
812 | sum_ofs); | ||
813 | 817 | ||
814 | ret = jffs2_flash_writev(c, vecs, 2, sum_ofs, &retlen, 0); | 818 | ret = jffs2_flash_writev(c, vecs, 2, sum_ofs, &retlen, 0); |
815 | 819 | ||