printk/sound: handle more message headers

Commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing
continuation lines") allows to define more message headers for a single
message.  The motivation is that continuous lines might get mixed.
Therefore it make sense to define the right log level for every piece of
a cont line.

This patch allows to copy only the real message level.  We should ignore
KERN_CONT because <filename:line> is added for each message.  By other
words, we want to know where each piece of the line comes from.

[pmladek@suse.com: fix a check of the valid message level]
Link: http://lkml.kernel.org/r/20161111183444.GE2145@dhcp128.suse.cz
Link: http://lkml.kernel.org/r/1478695291-12169-5-git-send-email-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Cc: Joe Perches <joe@perches.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <jbacik@fb.com>
Cc: David Sterba <dsterba@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/sound/core/misc.c b/sound/core/misc.c
index f2e8226c88fbb962b68fdab5ff40cae30813e873..21b228046e8850d5db07ab2cce064006604a7bd4 100644 (file)
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -71,6 +71,7 @@ void __snd_printk(unsigned int level, const char *path, int line,
        int kern_level;
        struct va_format vaf;
        char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";
+       bool level_found = false;
 #endif
 
 #ifdef CONFIG_SND_DEBUG
@@ -83,15 +84,22 @@ void __snd_printk(unsigned int level, const char *path, int line,
        vaf.fmt = format;
        vaf.va = &args;
 
-       kern_level = printk_get_level(format);
-       if (kern_level) {
-               const char *end_of_header = printk_skip_level(format);
-               memcpy(verbose_fmt, format, end_of_header - format);
+       while ((kern_level = printk_get_level(vaf.fmt)) != 0) {
+               const char *end_of_header = printk_skip_level(vaf.fmt);
+
+               /* Ignore KERN_CONT. We print filename:line for each piece. */
+               if (kern_level >= '0' && kern_level <= '7') {
+                       memcpy(verbose_fmt, vaf.fmt, end_of_header - vaf.fmt);
+                       level_found = true;
+               }
+
                vaf.fmt = end_of_header;
-       } else if (level)
+       }
+
+       if (!level_found && level)
                memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
-       printk(verbose_fmt, sanity_file_name(path), line, &vaf);
 
+       printk(verbose_fmt, sanity_file_name(path), line, &vaf);
 #else
        vprintk(format, args);
 #endif