someOS/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.38/rc2-holder' into for-2.6.38/core

Browse Source
This commit is contained in:
Jens Axboe
2010-11-16 10:10:12 +01:00
parent a02056349c bdc85df7a8
commit 5fbf856392
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-cgroup.c
View File

@@ -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);