diff options
| author | Petr Vorel <petr.vorel@gmail.com> | 2018-03-24 01:49:23 +0100 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2018-03-24 06:37:10 +0100 |
| commit | afb6fda2ae0b04f806a55fc5882df49a8eab572d (patch) | |
| tree | bb1529056b10f19e4a016cfc170acf7695ac6390 /fs | |
| parent | e9951281585060a7ba9d9826e286ff3e7ed067bb (diff) | |
Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig
Introduce another difference from upstream (kernel) source in
fs/ubifs/super.c: adding preprocessor condition as y variable in
mount_ubifs() depends on CONFIG_UBIFS_SILENCE_MSG:
fs/ubifs/super.c:1337:15: error: variable ?y? set but not used [-Werror=unused-but-set-variable]
long long x, y;
Not setting CONFIG_UBIFS_SILENCE_MSG in am335x_igep003x_defconfig and
igep0032_defconfig. Although it was defined in their config headers, it
depends on CMD_UBIFS which is not set for them.
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/Kconfig | 6 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 7 |
2 files changed, 12 insertions, 1 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); |