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

tracing: Convert seq_buf_path() to be like seq_path()

Browse Source 
Rewrite seq_buf_path() like it is done in seq_path() and allow
it to accept any escape character instead of just "\n".

Making seq_buf_path() like seq_path() will help prevent problems
when converting seq_file to use the seq_buf logic.

Link: http://lkml.kernel.org/r/20141104160222.048795666@goodmis.org
Link: http://lkml.kernel.org/r/20141114011412.338523371@goodmis.org

Tested-by: Jiri Kosina <jkosina@suse.cz>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2014-10-29 13:48:37 -04:00 committed by Steven Rostedt
parent 3a161d99c4
commit dd23180aac
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/seq_buf.h
View File

@ -73,7 +73,7 @@ extern int seq_buf_putc(struct seq_buf *s, unsigned char c);
extern int seq_buf_putmem(struct seq_buf *s, const void *mem, unsigned int len); extern int seq_buf_putmem(struct seq_buf *s, const void *mem, unsigned int len);
extern int seq_buf_putmem_hex(struct seq_buf *s, const void *mem, extern int seq_buf_putmem_hex(struct seq_buf *s, const void *mem,
unsigned int len); unsigned int len);
extern int seq_buf_path(struct seq_buf *s, const struct path *path); extern int seq_buf_path(struct seq_buf *s, const struct path *path, const char *esc);
extern int seq_buf_bitmask(struct seq_buf *s, const unsigned long *maskp, extern int seq_buf_bitmask(struct seq_buf *s, const unsigned long *maskp,
int nmaskbits); int nmaskbits);

28
kernel/trace/seq_buf.c
View File

@ -272,28 +272,32 @@ int seq_buf_putmem_hex(struct seq_buf *s, const void *mem,
* seq_buf_path - copy a path into the sequence buffer * seq_buf_path - copy a path into the sequence buffer
* @s: seq_buf descriptor * @s: seq_buf descriptor
* @path: path to write into the sequence buffer. * @path: path to write into the sequence buffer.
* @esc: set of characters to escape in the output
* *
* Write a path name into the sequence buffer. * Write a path name into the sequence buffer.
* *
* Returns zero on success, -1 on overflow * Returns the number of written bytes on success, -1 on overflow
*/ */
int seq_buf_path(struct seq_buf *s, const struct path *path) int seq_buf_path(struct seq_buf *s, const struct path *path, const char *esc)
{ {
unsigned int len = seq_buf_buffer_left(s); char *buf = s->buffer + s->len;
unsigned char *p; size_t size = seq_buf_buffer_left(s);
int res = -1;
WARN_ON(s->size == 0); WARN_ON(s->size == 0);
p = d_path(path, s->buffer + s->len, len); if (size) {
if (!IS_ERR(p)) { char *p = d_path(path, buf, size);
p = mangle_path(s->buffer + s->len, p, "\n"); if (!IS_ERR(p)) {
if (p) { char *end = mangle_path(buf, p, esc);
s->len = p - s->buffer; if (end)
return 0; res = end - buf;
} }
} }
seq_buf_set_overflow(s); if (res > 0)
return -1; s->len += res;
return res;
} }
/** /**

5
kernel/trace/trace_seq.c
View File

@ -326,7 +326,6 @@ EXPORT_SYMBOL_GPL(trace_seq_putmem_hex);
int trace_seq_path(struct trace_seq *s, const struct path *path) int trace_seq_path(struct trace_seq *s, const struct path *path)
{ {
unsigned int save_len = s->seq.len; unsigned int save_len = s->seq.len;
int ret;
if (s->full) if (s->full)
return 0; return 0;
@ -338,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
return 0; return 0;
} }
ret = seq_buf_path(&s->seq, path); seq_buf_path(&s->seq, path, "\n");
if (unlikely(seq_buf_has_overflowed(&s->seq))) { if (unlikely(seq_buf_has_overflowed(&s->seq))) {
s->seq.len = save_len; s->seq.len = save_len;
@ -346,7 +345,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
return 0; return 0;
} }
return ret; return 1;
} }
EXPORT_SYMBOL_GPL(trace_seq_path); EXPORT_SYMBOL_GPL(trace_seq_path);