tracing: make trace_seq_reset global and rename to trace_seq_init

Impact: clean up

The trace_seq functions may be used separately outside of the ftrace
iterator. The trace_seq_reset is needed for these operations.

This patch also renames trace_seq_reset to the more appropriate
trace_seq_init.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c5e39cd7310db2a371a6ff1c872b4bf473750b12..ea055aa21cd977e78cc6bbbce03479a18ad8cfaf 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -342,13 +342,6 @@ __update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
        tracing_record_cmdline(tsk);
 }
 
-static void
-trace_seq_reset(struct trace_seq *s)
-{
-       s->len = 0;
-       s->readpos = 0;
-}
-
 ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf, size_t cnt)
 {
        int len;
@@ -395,7 +388,7 @@ trace_print_seq(struct seq_file *m, struct trace_seq *s)
        s->buffer[len] = 0;
        seq_puts(m, s->buffer);
 
-       trace_seq_reset(s);
+       trace_seq_init(s);
 }
 
 /**
@@ -2620,7 +2613,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
        if (sret != -EBUSY)
                return sret;
 
-       trace_seq_reset(&iter->seq);
+       trace_seq_init(&iter->seq);
 
        /* copy the tracer to avoid using a global lock all around */
        mutex_lock(&trace_types_lock);
@@ -2682,7 +2675,7 @@ waitagain:
        /* Now copy what we have to the user */
        sret = trace_seq_to_user(&iter->seq, ubuf, cnt);
        if (iter->seq.readpos >= iter->seq.len)
-               trace_seq_reset(&iter->seq);
+               trace_seq_init(&iter->seq);
 
        /*
         * If there was nothing to send to user, inspite of consuming trace
@@ -2819,7 +2812,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
                partial[i].offset = 0;
                partial[i].len = iter->seq.len;
 
-               trace_seq_reset(&iter->seq);
+               trace_seq_init(&iter->seq);
        }
 
        mutex_unlock(&iter->mutex);
@@ -3631,7 +3624,7 @@ trace_printk_seq(struct trace_seq *s)
 
        printk(KERN_TRACE "%s", s->buffer);
 
-       trace_seq_reset(s);
+       trace_seq_init(s);
 }
 
 void ftrace_dump(void)

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index f6fa0b9f83a8fcb9bd9fc2124515ef56f36b40a4..cf6ba4181b14d753a21d68bdafe1e40289ae6b4a 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -395,6 +395,14 @@ struct trace_seq {
        unsigned int            readpos;
 };
 
+static inline void
+trace_seq_init(struct trace_seq *s)
+{
+       s->len = 0;
+       s->readpos = 0;
+}
+
+
 #define TRACE_PIPE_ALL_CPU     -1
 
 /*