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>
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 7a5b7b9..6bb5e3f 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -120,7 +120,7 @@
void *private;
int __percpu *disabled;
#ifdef CONFIG_DYNAMIC_FTRACE
- int trampolines;
+ int nr_trampolines;
struct ftrace_hash *notrace_hash;
struct ftrace_hash *filter_hash;
struct ftrace_hash *tramp_hash;
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 7628060..eda69c9 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1513,7 +1513,7 @@
* 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 @@
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 @@
*/
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 @@
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 @@
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;