Commit 62a92c8f authored Jun 07, 2016 by Alexander Shishkin Committed by Ingo Molnar Jun 08, 2016

perf/core: Remove a redundant check



There is no way to end up in _free_event() with event::pmu being NULL.
The latter is initialized in event allocation path and remains set
forever. In case of allocation failure, the error path doesn't use
_free_event().

Having the check, however, suggests that it is possible to have a
event::pmu==NULL situation in _free_event() and confuses the robots.

This patch gets rid of the check.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: eranian@google.com
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/1465303455-26032-1-git-send-email-alexander.shishkin@linux.intel.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 3b94a891

kernel/events/core.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -3862,10 +3862,8 @@ static void _free_event(struct perf_event *event)
		if (event->ctx)
		put_ctx(event->ctx);

		if (event->pmu) {
		exclusive_event_destroy(event);
		module_put(event->pmu->module);
		}

		call_rcu(&event->rcu_head, free_event_rcu);
		}

Admin message