[U-Boot,1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

Message ID 20180210132415.19725-1-petr.vorel@gmail.com
State New
Delegated to: Heiko Schocher
Headers show
Series
  • [U-Boot,1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG
Related show

Commit Message

Petr Vorel Feb. 10, 2018, 1:24 p.m.
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>
---
Note, not sure whether we need to keep this workaround.  If not, it
might be better to get rid of both CONFIG_UBI_SILENCE_MSG and
CONFIG_UBIFS_SILENCE_MSG.

Petr
---
 fs/ubifs/ubifs.h | 4 ++++
 1 file changed, 4 insertions(+)

Patch

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, ...)                                      \