summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-07-23 21:03:00 +0200
committerSteven Rostedt <rostedt@goodmis.org>2014-07-23 21:03:00 +0200
commit0162d621ddf3bd02bf7de324dcf002d9c84c5059 (patch)
treeba112ba7396d042a0409b6794c7d53e49f28c2be /kernel/trace
parenttracing: Convert local function_graph functions to static (diff)
downloadlinux-0162d621ddf3bd02bf7de324dcf002d9c84c5059.tar.xz
linux-0162d621ddf3bd02bf7de324dcf002d9c84c5059.zip
ftrace: Rename ftrace_ops field from trampolines to nr_trampolines
Having two fields within the same struct that is off by one character can be confusing and error prone. Rename the counter "trampolines" to "nr_trampolines" to explicitly show it is a counter and not to be confused by the "trampoline" field. Suggested-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/ftrace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 762806026561..eda69c9f78d0 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1513,7 +1513,7 @@ static void ftrace_remove_tramp(struct ftrace_ops *ops,
* The tramp_hash entry will be removed at time
* of update.
*/
- ops->trampolines--;
+ ops->nr_trampolines--;
rec->flags &= ~FTRACE_FL_TRAMP;
}
@@ -1522,7 +1522,7 @@ static void ftrace_clear_tramps(struct dyn_ftrace *rec)
struct ftrace_ops *op;
do_for_each_ftrace_op(op, ftrace_ops_list) {
- if (op->trampolines)
+ if (op->nr_trampolines)
ftrace_remove_tramp(op, rec);
} while_for_each_ftrace_op(op);
}
@@ -1617,7 +1617,7 @@ static void __ftrace_hash_rec_update(struct ftrace_ops *ops,
*/
if (ftrace_rec_count(rec) == 1 && ops->trampoline) {
rec->flags |= FTRACE_FL_TRAMP;
- ops->trampolines++;
+ ops->nr_trampolines++;
} else {
/*
* If we are adding another function callback
@@ -2185,7 +2185,7 @@ static int ftrace_save_ops_tramp_hash(struct ftrace_ops *ops)
int size, bits;
int ret;
- size = ops->trampolines;
+ size = ops->nr_trampolines;
bits = 0;
/*
* Make the hash size about 1/2 the # found
@@ -2239,7 +2239,7 @@ static int ftrace_save_tramp_hashes(void)
free_ftrace_hash(op->tramp_hash);
op->tramp_hash = NULL;
- if (op->trampolines) {
+ if (op->nr_trampolines) {
ret = ftrace_save_ops_tramp_hash(op);
if (ret)
return ret;