diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-11-06 16:38:28 -0500 |
|---|---|---|
| committer | Daniel Thompson <daniel.thompson@linaro.org> | 2017-02-24 15:59:38 +0000 |
| commit | 24326affad5bc8286046c00d0e7fc7ee830408d9 (patch) | |
| tree | eff3fc3be8d8cf92f4d47045a21f9bcd65cfbbe7 | |
| parent | d3336bc4b58f65cbf9a51a8eaa060e1d80385190 (diff) | |
UPSTREAM: seq_buf: Create seq_buf_used() to find out how much was written
Add a helper function seq_buf_used() that replaces the SEQ_BUF_USED()
private macro to let callers have a method to know how much of the
seq_buf was written to.
Link: http://lkml.kernel.org/r/20141114011412.170377300@goodmis.org
Link: http://lkml.kernel.org/r/20141114011413.321654244@goodmis.org
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Patchset: trace-seq/seq-buf/x86/printk: Print all stacks from NMI safely
(cherry picked from commit eeab98154dc0b49afd398afdd71c464a8af5911f)
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
| -rw-r--r-- | include/linux/seq_buf.h | 6 | ||||
| -rw-r--r-- | kernel/trace/seq_buf.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/seq_buf.h b/include/linux/seq_buf.h index 5d91262433e2..93718e570d4c 100644 --- a/include/linux/seq_buf.h +++ b/include/linux/seq_buf.h @@ -64,6 +64,12 @@ seq_buf_buffer_left(struct seq_buf *s) return (s->size - 1) - s->len; } +/* How much buffer was written? */ +static inline unsigned int seq_buf_used(struct seq_buf *s) +{ + return min(s->len, s->size); +} + extern __printf(2, 3) int seq_buf_printf(struct seq_buf *s, const char *fmt, ...); extern __printf(2, 0) diff --git a/kernel/trace/seq_buf.c b/kernel/trace/seq_buf.c index 7dac34d1235b..9ec5305d9da7 100644 --- a/kernel/trace/seq_buf.c +++ b/kernel/trace/seq_buf.c @@ -16,9 +16,6 @@ #include <linux/seq_file.h> #include <linux/seq_buf.h> -/* How much buffer is written? */ -#define SEQ_BUF_USED(s) min((s)->len, (s)->size - 1) - /** * seq_buf_print_seq - move the contents of seq_buf into a seq_file * @m: the seq_file descriptor that is the destination @@ -28,7 +25,7 @@ */ int seq_buf_print_seq(struct seq_file *m, struct seq_buf *s) { - unsigned int len = SEQ_BUF_USED(s); + unsigned int len = seq_buf_used(s); return seq_write(m, s->buffer, len); } |