From 498e27e5438c1199365d001b390177b76e849825 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Thu, 3 Mar 2011 14:25:50 +0800 Subject: [PATCH] --- yaml --- r: 234499 b: refs/heads/master c: f75e18cb9627b1d3d752b83a0b5563da0042c50a h: refs/heads/master i: 234497: c372021a6f947821f995be4834c96e1271184da5 234495: 17e522513e3f851e47435721b330b74bd722ee84 v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8315b66d4a07..b1bb5c4fd85d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3db272c0494900fcb905a201180a78cae3addd6e +refs/heads/master: f75e18cb9627b1d3d752b83a0b5563da0042c50a diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 7c999e809ba3..b00209544d57 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -412,6 +412,9 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, cgrp = container_of(css, struct perf_cgroup, css); event->cgrp = cgrp; + /* must be done before we fput() the file */ + perf_get_cgroup(event); + /* * all events in a group must monitor * the same cgroup because a task belongs @@ -420,9 +423,6 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, if (group_leader && group_leader->cgrp != cgrp) { perf_detach_cgroup(event); ret = -EINVAL; - } else { - /* must be done before we fput() the file */ - perf_get_cgroup(event); } out: fput_light(file, fput_needed);