From: Petr Vorel <petr.vorel@gmail.com>
Date: Sat, 24 Mar 2018 00:49:22 +0000 (+0100)
Subject: ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG
X-Git-Tag: v2018.05-rc1~6^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e9951281585060a7ba9d9826e286ff3e7ed067bb;p=u-boot

ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

Use of CONFIG_UBIFS_SILENCE_MSG was added in
147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 1d89465205..b4ce706a8e 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
 #define UBIFS_VERSION 1
 
 /* Normal UBIFS messages */
+#ifdef CONFIG_UBIFS_SILENCE_MSG
+#define ubifs_msg(c, fmt, ...)
+#else
 #define ubifs_msg(c, fmt, ...)                                      \
 	pr_notice("UBIFS (ubi%d:%d): " fmt "\n",                    \
 		  (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
+#endif
 /* UBIFS error messages */
 #ifndef __UBOOT__
 #define ubifs_err(c, fmt, ...)                                      \