On 02/08/2013 09:07 PM, Joe Hershberger wrote:
The prints are out of control. SILENCE!
Signed-off-by: Joe Hershberger joe.hershberger@ni.com
common/cmd_ubi.c | 3 +++ drivers/mtd/mtdpart.c | 14 ++++++++------ drivers/mtd/ubi/ubi.h | 3 ++- fs/ubifs/ubifs.h | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 01335dd..02b6b81 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -23,6 +23,9 @@ #include <asm/errno.h> #include <jffs2/load_kernel.h>
+#undef ubi_msg +#define ubi_msg(fmt, ...) printk(KERN_NOTICE "UBI: " fmt "\n", ##__VA_ARGS__)
#define DEV_TYPE_NONE 0 #define DEV_TYPE_NAND 1 #define DEV_TYPE_ONENAND 2 diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 96dcda2..2c60293 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -347,16 +347,18 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, if (mtd_mod_by_eb(cur_offset, master) != 0) { /* Round up to next erasesize */ slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
printk(KERN_NOTICE "Moving partition %d: ""0x%012llx -> 0x%012llx\n", partno,(unsigned long long)cur_offset, (unsigned long long)slave->offset);
debug("Moving partition %d: 0x%012llx -> 0x%012llx\n",partno, (unsigned long long)cur_offset,(unsigned long long)slave->offset);
- printk(KERN_NOTICE "0x%012llx-0x%012llx : "%s"\n", (unsigned long long)slave->offset,
(unsigned long long)(slave->offset + slave->mtd.size), slave->mtd.name);
debug("0x%012llx-0x%012llx : "%s"\n",
(unsigned long long)slave->offset,(unsigned long long)(slave->offset + slave->mtd.size),slave->mtd.name);/* let's do some sanity checks */ if (slave->offset >= master->size) {
@@ -463,7 +465,7 @@ int add_mtd_partitions(struct mtd_info *master, if (mtd_partitions.next == NULL) INIT_LIST_HEAD(&mtd_partitions);
- printk(KERN_NOTICE "Creating %d MTD partitions on "%s":\n", nbparts, master->name);
- debug("Creating %d MTD partitions on "%s":\n", nbparts, master->name);
Not so sure about this one. Other users might find this message quite useful. Does this output really interfere with your UBI env handling?
for (i = 0; i < nbparts; i++) { slave = add_one_partition(master, parts + i, i, cur_offset); diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index 14c3a5f..f4ed7d8 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h @@ -59,7 +59,8 @@ #define UBI_NAME_STR "ubi"
/* Normal UBI messages */ -#define ubi_msg(fmt, ...) printk(KERN_NOTICE "UBI: " fmt "\n", ##__VA_ARGS__) +#define ubi_msg(fmt, ...) /*printk(KERN_NOTICE "UBI: " fmt "\n", \
##__VA_ARGS__)*/
Hmmm....
/* UBI warning messages */ #define ubi_warn(fmt, ...) printk(KERN_WARNING "UBI warning: %s: " fmt "\n", \ __func__, ##__VA_ARGS__) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 0af471a..4ab1cbd 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -464,7 +464,7 @@ static inline ino_t parent_ino(struct dentry *dentry)
/* Normal UBIFS messages */ #define ubifs_msg(fmt, ...) \
printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__)
/*printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__)*/
... Not sure again about this silencing. And these "removed" printk's are really ugly.
Could you please give an example of UBI usage (message logs from "ubi create ..., ubi part ..., ubi read ...") without this patch (or complete patchset) and with it? So that we see the real difference?
Thanks, Stefan