summaryrefslogtreecommitdiff
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-09-09 08:43:22 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-09-14 11:42:29 -0400
commit2bccfffd1538f3523847583213567e2f7ce00926 (patch)
tree7062e0bfc46f66efa2ec3231a6c718a901a0a80c /kernel/trace/ftrace.c
parentbfa88ea7ee9e6b4fd673e45a8cc0a8e0b7ef4761 (diff)
downloadlwn-2bccfffd1538f3523847583213567e2f7ce00926.tar.gz
lwn-2bccfffd1538f3523847583213567e2f7ce00926.zip
tracing: Do not reset *pos in set_ftrace_filter
After the filtered functions are read, the probed functions are read from the hash in set_ftrace_filter. When the hashed probed functions are read, the *pos passed in is reset. Instead of modifying the pos given to the read function, just record the pos where the filtered functions ended and subtract from that. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r--kernel/trace/ftrace.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index fa7ece649fe1..585ea27025b1 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1368,6 +1368,7 @@ enum {
#define FTRACE_BUFF_MAX (KSYM_SYMBOL_LEN+4) /* room for wildcards */
struct ftrace_iterator {
+ loff_t func_pos;
struct ftrace_page *pg;
int hidx;
int idx;
@@ -1418,12 +1419,15 @@ static void *t_hash_start(struct seq_file *m, loff_t *pos)
loff_t l;
if (!(iter->flags & FTRACE_ITER_HASH))
- *pos = 0;
+ iter->func_pos = *pos;
+
+ if (iter->func_pos > *pos)
+ return NULL;
iter->flags |= FTRACE_ITER_HASH;
iter->hidx = 0;
- for (l = 0; l <= *pos; ) {
+ for (l = 0; l <= (*pos - iter->func_pos); ) {
p = t_hash_next(m, p, &l);
if (!p)
break;