Skip to content

Commit

Permalink
seq_buf: Create seq_buf_used() to find out how much was written
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steven Rostedt (Red Hat) committed Nov 20, 2014
1 parent 0736c03 commit eeab981
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 6 additions & 0 deletions include/linux/seq_buf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions kernel/trace/seq_buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
}
Expand Down

0 comments on commit eeab981

Please sign in to comment.