summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-11-16 10:10:12 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-11-16 10:10:12 +0100
commit5fbf85639287b6ea287f4f5e5e7e36608f0f60bd (patch)
tree608a51e6ee572dba94b43f1933e49ab88562e4c0 /block
parenta02056349cdea2252cd2b21643ebf025e83a29f2 (diff)
parentbdc85df7a8417b9893443ff5520804699416b6f3 (diff)
downloadlinux-3.10-5fbf85639287b6ea287f4f5e5e7e36608f0f60bd.tar.gz
linux-3.10-5fbf85639287b6ea287f4f5e5e7e36608f0f60bd.tar.bz2
linux-3.10-5fbf85639287b6ea287f4f5e5e7e36608f0f60bd.zip
Merge branch 'for-2.6.38/rc2-holder' into for-2.6.38/core
Diffstat (limited to 'block')
-rw-r--r--block/blk-cgroup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index b1febd0f6d2..455768a3eb9 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1452,10 +1452,6 @@ blkiocg_create(struct cgroup_subsys *subsys, struct cgroup *cgroup)
goto done;
}
- /* Currently we do not support hierarchy deeper than two level (0,1) */
- if (parent != cgroup->top_cgroup)
- return ERR_PTR(-EPERM);
-
blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL);
if (!blkcg)
return ERR_PTR(-ENOMEM);