ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

PATCH New Petr Vorel 1 participant 1 message Mar 19, 2018 2 messages not in the archive

lore

Share & tools

lore

Petr Vorel

author

2018-03-19 10:22 UTC #2 lore raw

PATCH 1/3 ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

In reply to a message not in the archive

Hello Heiko,

Quoted 45 lines

Hello Petr,
Am 18.03.2018 um 19:30 schrieb Petr Vorel:
Quoted 28 lines
Hi,
Quoted 25 lines
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 <[email protected]>
Cc Heiko Schocher <[email protected]>
Signed-off-by Petr Vorel <[email protected]>
---
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(+)
fs/ubifs/ubifs.h +0 -0
index 1d89465205..b4ce706a8e 100644
@@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
  #define UBIFS_VERSION 1
Quoted 13 lines
fs/ubifs/ubifs.h static inline ino_t parent_ino(struct dentry *dentry) · line 629
Quoted 11 lines
fs/ubifs/ubifs.h +4 -0
  /* 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, ...)
ping, please.

Quoted 1 line

Sorry was to busy the last weeks ...

No problem, understood. Thanks for having a look at the patches.

Quoted 25 lines

Hmm.. just see, that your patch
http://patchwork.ozlabs.org/patch/871707/
does not apply to current mainline:
2018-03-13 03:12:10,755:CON    :tbotlib   # tb_ctrl: Applying: Convert
CONFIG_UBIFS_SILENCE_MSG to Kconfig
Using index info to reconstruct a base tree...
M README
M configs/am335x_igep003x_defconfig
M scripts/config_whitelist.txt
Falling back to patching base and 3-way merge... Auto-merging scripts/config_whitelist.txt
Auto-merging configs/am335x_igep003x_defconfig
CONFLICT (content): Merge conflict in configs/am335x_igep003x_defconfig Auto-merging README
error: Failed to merge in the changes.
Patch failed at 0001 Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". hs at pollux [ 4:12:10] ttbott>

Quoted 1 line

Can you please send a rebased v2 ?

Done. I dared even to update patchwork (superseded v1 patch-set and delegate you to v2 patch-set).

Quoted 3 lines

Beside of this I am fine with your patchset.
May it would be nice to see a Tested-by...

Sorry that I didn't test it on real device / qemu. I just test the compilation, which might not be enough.

+ I fixed wrong ML address, so this gets published.

Quoted 2 lines

bye,
Heiko

Kind regards,
Petr