From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753195Ab2GWNIL (ORCPT ); Mon, 23 Jul 2012 09:08:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32819 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751979Ab2GWNIL (ORCPT ); Mon, 23 Jul 2012 09:08:11 -0400 Date: Mon, 23 Jul 2012 09:07:59 -0400 From: Jason Baron To: Jim Cromie , greg@kroah.com Cc: linux-kernel@vger.kernel.org, kay@vrfy.com, joe@perches.com Subject: Re: [PATCH 1/3] drivers-core: make structured logging play nice with dynamic-debug Message-ID: <20120723130759.GB28867@redhat.com> References: <1342727183-4520-1-git-send-email-jim.cromie@gmail.com> <1342727183-4520-2-git-send-email-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1342727183-4520-2-git-send-email-jim.cromie@gmail.com> User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 19, 2012 at 01:46:20PM -0600, Jim Cromie wrote: > commit c4e00daaa96d3a0786f1f4fe6456281c60ef9a16 changed __dev_printk > in a way that broke dynamic-debug's ability to control the dynamic > prefix of dev_dbg(dev,..), but not dev_dbg(NULL,..) or pr_debug(..), > which is why it wasnt noticed sooner. > > When dev==NULL, __dev_printk() just calls printk(), which just works. > But otherwise, it assumed that level was always a string like "" > and just plucked out the 'L', ignoring the rest. However, > dynamic_emit_prefix() adds "[tid] module:func:line:" to the string, > those additions all got lost. > > Signed-off-by: Jim Cromie > --- > drivers/base/core.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > Acked-by: Jason Baron > diff --git a/drivers/base/core.c b/drivers/base/core.c > index 346be8b..ebdb7c5 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -1848,6 +1848,7 @@ int __dev_printk(const char *level, const struct device *dev, > struct va_format *vaf) > { > char dict[128]; > + const char *level_extra = ""; > size_t dictlen = 0; > const char *subsys; > > @@ -1894,10 +1895,14 @@ int __dev_printk(const char *level, const struct device *dev, > "DEVICE=+%s:%s", subsys, dev_name(dev)); > } > skip: > + if (level[3]) > + level_extra = &level[3]; /* skip past "" */ > + > return printk_emit(0, level[1] - '0', > dictlen ? dict : NULL, dictlen, > - "%s %s: %pV", > - dev_driver_string(dev), dev_name(dev), vaf); > + "%s %s: %s%pV", > + dev_driver_string(dev), dev_name(dev), > + level_extra, vaf); > } > EXPORT_SYMBOL(__dev_printk); > > -- > 1.7.10.4 >