diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-04-20 19:32:44 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2009-04-20 19:32:44 +0200 |
| commit | e395898e98119085f666febbc7b631dd69bc637f (patch) | |
| tree | aa10e8a7c79c30c74db67bae6a9aa65201839065 | |
| parent | tracing: fix recursive test level calculation (diff) | |
| download | linux-e395898e98119085f666febbc7b631dd69bc637f.tar.xz linux-e395898e98119085f666febbc7b631dd69bc637f.zip | |
tracing: remove recursive test from ring_buffer_event_discard
The ring_buffer_event_discard is not tied to ring_buffer_lock_reserve.
It can be called inside or outside the reserve/commit. Even if it
is called inside the reserve/commit the commit part must also be called.
Only ring_buffer_discard_commit can be used as a replacement for
ring_buffer_unlock_commit.
This patch removes the trace_recursive_unlock from ring_buffer_event_discard
since it would be the wrong place to do so.
[Impact: prevent breakage in trace recursive testing ]
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/trace/ring_buffer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index aa40ae92233b..a6997670cc46 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1667,7 +1667,6 @@ static inline void rb_event_discard(struct ring_buffer_event *event) void ring_buffer_event_discard(struct ring_buffer_event *event) { rb_event_discard(event); - trace_recursive_unlock(); } EXPORT_SYMBOL_GPL(ring_buffer_event_discard); |