diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-05-20 14:05:12 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-06-09 15:13:55 -0400 |
| commit | 4251c717029ca9a0803c0b3e0eeb8853f46530ac (patch) | |
| tree | f1557231d22597cb737d6a82cc272945be8fdaf1 | |
| parent | ebbfe0c95929fac79b466f69a94f91f2ed28a9d6 (diff) | |
tracing: trace_events_synth: Convert to printbuf
This converts from seq_buf to printbuf
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
| -rw-r--r-- | kernel/trace/trace_events_synth.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index 5e8c07aef071..627e0e45f0aa 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -5,13 +5,14 @@ * Copyright (C) 2015, 2020 Tom Zanussi <tom.zanussi@linux.intel.com> */ -#include <linux/module.h> #include <linux/kallsyms.h> -#include <linux/security.h> +#include <linux/module.h> #include <linux/mutex.h> +#include <linux/printbuf.h> +#include <linux/rculist.h> +#include <linux/security.h> #include <linux/slab.h> #include <linux/stacktrace.h> -#include <linux/rculist.h> #include <linux/tracefs.h> /* for gfp flag names */ @@ -611,7 +612,7 @@ static struct synth_field *parse_synth_field(int argc, char **argv, const char *prefix = NULL, *field_type = argv[0], *field_name, *array; struct synth_field *field; int len, ret = -ENOMEM; - struct seq_buf s; + struct printbuf s; ssize_t size; if (!strcmp(field_type, "unsigned")) { @@ -666,17 +667,15 @@ static struct synth_field *parse_synth_field(int argc, char **argv, if (!field->type) goto free; - seq_buf_init(&s, field->type, len); + s = PRINTBUF_EXTERN(field->type, len); if (prefix) - seq_buf_puts(&s, prefix); - seq_buf_puts(&s, field_type); + prt_str(&s, prefix); + prt_str(&s, field_type); if (array) - seq_buf_puts(&s, array); - if (WARN_ON_ONCE(!seq_buf_buffer_left(&s))) + prt_str(&s, array); + if (WARN_ON_ONCE(!printbuf_remaining(&s))) goto free; - s.buffer[s.len] = '\0'; - size = synth_field_size(field->type); if (size < 0) { if (array) @@ -694,13 +693,12 @@ static struct synth_field *parse_synth_field(int argc, char **argv, if (!type) goto free; - seq_buf_init(&s, type, len); - seq_buf_puts(&s, "__data_loc "); - seq_buf_puts(&s, field->type); + s = PRINTBUF_EXTERN(type, len); + prt_str(&s, "__data_loc "); + prt_str(&s, field->type); - if (WARN_ON_ONCE(!seq_buf_buffer_left(&s))) + if (WARN_ON_ONCE(!printbuf_remaining(&s))) goto free; - s.buffer[s.len] = '\0'; kfree(field->type); field->type = type; |