From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935545Ab1JGUfC (ORCPT ); Fri, 7 Oct 2011 16:35:02 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:37085 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935243Ab1JGUe4 (ORCPT ); Fri, 7 Oct 2011 16:34:56 -0400 From: jim.cromie@gmail.com To: jbaron@redhat.com Cc: greg@kroah.com, joe@perches.com, bart.vanassche@gmail.com, linux-kernel@vger.kernel.org, Jim Cromie Subject: [PATCH 20/26] dynamic_debug: make ddebug_describe_flags more generic Date: Fri, 7 Oct 2011 14:33:26 -0600 Message-Id: <1318019612-20068-21-git-send-email-jim.cromie@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1318019612-20068-1-git-send-email-jim.cromie@gmail.com> References: <1316642115-20029-1-git-send-email-jim.cromie@gmail.com> <1318019612-20068-1-git-send-email-jim.cromie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jim Cromie Alter fn-sig to accept flags arg directly, instead of a ptr to structure containing it. This lets us reuse it for pending-queries. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 3c9244d..d7b71a6 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -103,7 +103,7 @@ static struct { unsigned flag:8; char opt_char; } opt_array[] = { }; /* format a string into buf[] which describes the _ddebug's flags */ -static char *ddebug_describe_flags(struct _ddebug *dp, char *buf, +static char *ddebug_describe_flags(unsigned int flags, char *buf, size_t maxlen) { char *p = buf; @@ -112,7 +112,7 @@ static char *ddebug_describe_flags(struct _ddebug *dp, char *buf, BUG_ON(maxlen < 10); *p++ = '='; for (i = 0; i < ARRAY_SIZE(opt_array); ++i) - if (dp->flags & opt_array[i].flag) + if (flags & opt_array[i].flag) *p++ = opt_array[i].opt_char; if (*(p-1) == '=') *p++ = '_'; @@ -227,7 +227,8 @@ static int ddebug_change(const struct ddebug_query *query, pr_info("changed %s:%d [%s]%s %s\n", trim_prefix(dp->filename), dp->lineno, dt->mod_name, dp->function, - ddebug_describe_flags(dp, flagbuf, + ddebug_describe_flags(dp->flags, + flagbuf, sizeof(flagbuf))); } } @@ -901,7 +902,7 @@ static int ddebug_proc_show(struct seq_file *m, void *p) seq_printf(m, "%s:%u [%s]%s %s \"", trim_prefix(dp->filename), dp->lineno, iter->table->mod_name, dp->function, - ddebug_describe_flags(dp, flagsbuf, sizeof(flagsbuf))); + ddebug_describe_flags(dp->flags, flagsbuf, sizeof(flagsbuf))); seq_escape(m, dp->format, "\t\r\n\""); seq_puts(m, "\"\n"); -- 1.7.4.4