From 0c7066ca14c6ac8986510ba5bd946b0b50373d84 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 6 Jul 2010 11:09:00 +0100 Subject: [PATCH] fix mis-applied upstream commit ac9721f3f54b27a16c7e1afb2481e7ee95a70318 For some reason one of the changes to sys_perf_event_open() got mis-applied, thus breaking (at least) error handling paths (pointed out by means of a compiler warning). Signed-off-by: Jan Beulich Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/perf_event.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index a2446518c9ce..2357b19b2451 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -4870,6 +4870,15 @@ SYSCALL_DEFINE5(perf_event_open, if (event_fd < 0) return event_fd; + /* + * Get the target context (task or percpu): + */ + ctx = find_get_context(pid, cpu); + if (IS_ERR(ctx)) { + err = PTR_ERR(ctx); + goto err_fd; + } + if (group_fd != -1) { group_leader = perf_fget_light(group_fd, &fput_needed); if (IS_ERR(group_leader)) { @@ -4883,15 +4892,6 @@ SYSCALL_DEFINE5(perf_event_open, group_leader = NULL; } - /* - * Get the target context (task or percpu): - */ - ctx = find_get_context(pid, cpu); - if (IS_ERR(ctx)) { - err = PTR_ERR(ctx); - goto err_fd; - } - /* * Look up the group leader (we will attach this event to it): */ -- 2.39.5