diff options
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r-- | kernel/perf_event.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 7c999e809ba3..b00209544d57 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -412,6 +412,9 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, | |||
412 | cgrp = container_of(css, struct perf_cgroup, css); | 412 | cgrp = container_of(css, struct perf_cgroup, css); |
413 | event->cgrp = cgrp; | 413 | event->cgrp = cgrp; |
414 | 414 | ||
415 | /* must be done before we fput() the file */ | ||
416 | perf_get_cgroup(event); | ||
417 | |||
415 | /* | 418 | /* |
416 | * all events in a group must monitor | 419 | * all events in a group must monitor |
417 | * the same cgroup because a task belongs | 420 | * the same cgroup because a task belongs |
@@ -420,9 +423,6 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, | |||
420 | if (group_leader && group_leader->cgrp != cgrp) { | 423 | if (group_leader && group_leader->cgrp != cgrp) { |
421 | perf_detach_cgroup(event); | 424 | perf_detach_cgroup(event); |
422 | ret = -EINVAL; | 425 | ret = -EINVAL; |
423 | } else { | ||
424 | /* must be done before we fput() the file */ | ||
425 | perf_get_cgroup(event); | ||
426 | } | 426 | } |
427 | out: | 427 | out: |
428 | fput_light(file, fput_needed); | 428 | fput_light(file, fput_needed); |