leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracing: Convert trace_printk() formats for module to const char *

Browse Source 
The trace_printk() formats for modules do not show up in the
debugfs/tracing/printk_formats file. Only the formats that are
for trace_printk()s that are in the kernel core.

To facilitate the change to add trace_printk() formats from modules
into that file as well, we need to convert the structure that
holds the formats from char fmt[], into const char *fmt,
and allocate them separately.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2011-03-21 22:59:21 -04:00 committed by Steven Rostedt
parent 176fcc5c5f
commit 0588fa30db
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/trace/trace_printk.c
View File

@ -32,7 +32,7 @@ static DEFINE_MUTEX(btrace_mutex);
struct trace_bprintk_fmt { struct trace_bprintk_fmt {
struct list_head list; struct list_head list;
char fmt[0]; const char *fmt;
}; };
static inline struct trace_bprintk_fmt *lookup_format(const char *fmt) static inline struct trace_bprintk_fmt *lookup_format(const char *fmt)
@ -49,6 +49,7 @@ static
void hold_module_trace_bprintk_format(const char **start, const char **end) void hold_module_trace_bprintk_format(const char **start, const char **end)
{ {
const char **iter; const char **iter;
char *fmt;
mutex_lock(&btrace_mutex); mutex_lock(&btrace_mutex);
for (iter = start; iter < end; iter++) { for (iter = start; iter < end; iter++) {
@ -58,14 +59,18 @@ void hold_module_trace_bprintk_format(const char **start, const char **end)
continue; continue;
} }
tb_fmt = kmalloc(offsetof(struct trace_bprintk_fmt, fmt) tb_fmt = kmalloc(sizeof(*tb_fmt), GFP_KERNEL);
+ strlen(*iter) + 1, GFP_KERNEL); if (tb_fmt)
if (tb_fmt) { fmt = kmalloc(strlen(*iter) + 1, GFP_KERNEL);
if (tb_fmt && fmt) {
list_add_tail(&tb_fmt->list, &trace_bprintk_fmt_list); list_add_tail(&tb_fmt->list, &trace_bprintk_fmt_list);
strcpy(tb_fmt->fmt, *iter); strcpy(fmt, *iter);
tb_fmt->fmt = fmt;
*iter = tb_fmt->fmt; *iter = tb_fmt->fmt;
} else } else {
kfree(tb_fmt);
*iter = NULL; *iter = NULL;
}
} }
mutex_unlock(&btrace_mutex); mutex_unlock(&btrace_mutex);
} }