Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd23180a authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

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

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: default avatarJiri Kosina <jkosina@suse.cz>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.cz>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 3a161d99

include/linux/seq_buf.h

+1 −1
Original line number Diff line number Diff line
@@ -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_hex(struct seq_buf *s, const void *mem,

			      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,

			   int nmaskbits);

kernel/trace/seq_buf.c

+16 −12
Original line number Diff line number Diff line
@@ -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

 * @s: seq_buf descriptor

 * @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.

 *

 * 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);

	unsigned char *p;

	char *buf = s->buffer + s->len;

	size_t size = seq_buf_buffer_left(s);

	int res = -1;



	WARN_ON(s->size == 0);



	p = d_path(path, s->buffer + s->len, len);

	if (size) {

		char *p = d_path(path, buf, size);

		if (!IS_ERR(p)) {

		p = mangle_path(s->buffer + s->len, p, "\n");

		if (p) {

			s->len = p - s->buffer;

			return 0;

			char *end = mangle_path(buf, p, esc);

			if (end)

				res = end - buf;

		}

	}

	seq_buf_set_overflow(s);

	return -1;

	if (res > 0)

		s->len += res;



	return res;

}



/**

kernel/trace/trace_seq.c

+2 −3
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ EXPORT_SYMBOL_GPL(trace_seq_putmem_hex); 
int trace_seq_path(struct trace_seq *s, const struct path *path)

{

	unsigned int save_len = s->seq.len;

	int ret;



	if (s->full)

		return 0;
@@ -338,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path) 
		return 0;

	}



	ret = seq_buf_path(&s->seq, path);

	seq_buf_path(&s->seq, path, "\n");



	if (unlikely(seq_buf_has_overflowed(&s->seq))) {

		s->seq.len = save_len;
@@ -346,7 +345,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path) 
		return 0;

	}



	return ret;

	return 1;

}

EXPORT_SYMBOL_GPL(trace_seq_path);