---

yaml --- r: 234499 b: refs/heads/master c: f75e18c h: refs/heads/master i: 234497: c372021 234495: 17e5225 v: v3
git-mirror · Mar 4, 2011 · 498e27e · 498e27e
1 parent b40a797
commit 498e27e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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);