diff options
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/Kconfig | 6 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 7 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig index e69de29bb2d..9da35b8a379 100644 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig @@ -0,0 +1,6 @@ +config UBIFS_SILENCE_MSG + bool "UBIFS silence verbose messages" + default ENV_IS_IN_UBI + help + Make the verbose messages from UBIFS stop printing. This leaves + warnings and errors enabled. diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index effa8d933fe..2c478cba963 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1334,7 +1334,10 @@ static int check_free_space(struct ubifs_info *c) static int mount_ubifs(struct ubifs_info *c) { int err; - long long x, y; + long long x; +#ifndef CONFIG_UBIFS_SILENCE_MSG + long long y; +#endif size_t sz; c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY); @@ -1613,7 +1616,9 @@ static int mount_ubifs(struct ubifs_info *c) c->vi.ubi_num, c->vi.vol_id, c->vi.name, c->ro_mount ? ", R/O mode" : ""); x = (long long)c->main_lebs * c->leb_size; +#ifndef CONFIG_UBIFS_SILENCE_MSG y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes; +#endif ubifs_msg(c, "LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes", c->leb_size, c->leb_size >> 10, c->min_io_size, c->max_write_size); diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 1d894652059..cbc4cb2bc89 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -611,16 +611,20 @@ static inline ino_t parent_ino(struct dentry *dentry) /* misc.h */ #define mutex_lock_nested(...) #define mutex_unlock_nested(...) -#define mutex_is_locked(...) 0 +#define mutex_is_locked(...) 1 #endif /* Version of this UBIFS implementation */ #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, ...) \ |