Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7

Conflicts:
	include/linux/ftrace_event.h
	include/trace/ftrace.h
	kernel/trace/trace_event_perf.c
	kernel/trace/trace_kprobe.c
	kernel/trace/trace_syscalls.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 5fe03def34b2..2cc682b860ea 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -286,16 +286,16 @@ done:
 static struct cgroup_subsys_state *
 blkiocg_create(struct cgroup_subsys *subsys, struct cgroup *cgroup)
 {
-        struct blkio_cgroup *blkcg, *parent_blkcg;
+        struct blkio_cgroup *blkcg;
+        struct cgroup *parent = cgroup->parent;
 
-        if (!cgroup->parent) {
+        if (!parent) {
                 blkcg = &blkio_root_cgroup;
                 goto done;
         }
 
         /* Currently we do not support hierarchy deeper than two level (0,1) */
-        parent_blkcg = cgroup_to_blkio_cgroup(cgroup->parent);
-        if (css_depth(&parent_blkcg->css) > 0)
+        if (parent != cgroup->top_cgroup)
                 return ERR_PTR(-EINVAL);
 
         blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL);