From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S943429AbcJ0Pxk (ORCPT ); Thu, 27 Oct 2016 11:53:40 -0400 Received: from mx2.suse.de ([195.135.220.15]:48420 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S943134AbcJ0Pxd (ORCPT ); Thu, 27 Oct 2016 11:53:33 -0400 From: Petr Mladek To: Linus Torvalds Cc: Joe Perches , Andrew Morton , Sergey Senozhatsky , Steven Rostedt , Jason Wessel , Jaroslav Kysela , Takashi Iwai , Chris Mason , Josef Bacik , David Sterba , linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH 4/4] printk/sound: Handle more message headers Date: Thu, 27 Oct 2016 17:52:54 +0200 Message-Id: <1477583574-30988-5-git-send-email-pmladek@suse.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1477583574-30988-1-git-send-email-pmladek@suse.com> References: <1477583574-30988-1-git-send-email-pmladek@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit 4bcc595ccd80decb4245096e ("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 tries to copy the entire header. Well, it limits it to 4 bytes because it does not make sense to combine more message headers except for KERN_CONT and some real level. Signed-off-by: Petr Mladek --- sound/core/misc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sound/core/misc.c b/sound/core/misc.c index f2e8226c88fb..52b719cc875d 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c @@ -68,9 +68,10 @@ void __snd_printk(unsigned int level, const char *path, int line, { va_list args; #ifdef CONFIG_SND_VERBOSE_PRINTK - int kern_level; struct va_format vaf; - char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV"; + char header[5] = KERN_DEFAULT; + const char *end_of_header; + size_t size_of_header; #endif #ifdef CONFIG_SND_DEBUG @@ -83,15 +84,18 @@ 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); + end_of_header = printk_skip_headers(format); + size_of_header = min((size_t)(end_of_header - format), + sizeof(header) - 1); + if (size_of_header) { + memcpy(header, format, size_of_header); + header[size_of_header] = '\0'; vaf.fmt = end_of_header; - } else if (level) - memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1); - printk(verbose_fmt, sanity_file_name(path), line, &vaf); + } else if (level) { + memcpy(header, KERN_DEBUG, sizeof(KERN_DEBUG) - 1); + } + printk("%sALSA %s:%d %pV", header, sanity_file_name(path), line, &vaf); #else vprintk(format, args); #endif -- 1.8.5.6