diff options
| author |   Steven Rostedt <srostedt@redhat.com> | 2012-11-30 10:41:57 -0500 |
|---|---|---|
| committer |   Steven Rostedt <rostedt@goodmis.org> | 2013-01-21 13:22:29 -0500 |
| commit | 771e03842a9e98a1c2013ca1ed8bb2793488f3e5 (patch) | |
| tree | 6d133d84777c6161520ab00a8ce8f016fd1bf261 /kernel/trace | |
| parent | tracing: Fix sparse warning with is_signed_type() macro (diff) | |
| download | linux-dev-771e03842a9e98a1c2013ca1ed8bb2793488f3e5.tar.xz linux-dev-771e03842a9e98a1c2013ca1ed8bb2793488f3e5.zip | |
ring-buffer: Remove unnecessary recusive call in rb_advance_iter()
The original ring-buffer code had special checks at the start
of rb_advance_iter() and instead of repeating them again at the
end of the function if a certain condition existed, I just did
a recursive call to rb_advance_iter() because the special condition
would cause rb_advance_iter() to return early (after the checks).
But as things have changed, the special checks no longer exist
and the only thing done for the special_condition is to call
rb_inc_iter() and return. Instead of doing a confusing recursive call,
just call rb_inc_iter instead.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index ce8514feedcd..6ff9cc4658ed 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -3425,7 +3425,7 @@ static void rb_advance_iter(struct ring_buffer_iter *iter) /* check for end of page padding */ if ((iter->head >= rb_page_size(iter->head_page)) && (iter->head_page != cpu_buffer->commit_page)) - rb_advance_iter(iter); + rb_inc_iter(iter); } static int rb_lost_events(struct ring_buffer_per_cpu *cpu_buffer) |