diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
| commit | 8e04221029067cbaff3fc8f4daf991532afbcbaf (patch) | |
| tree | 18cf757bcd315c76f5f458aa72a0a57db0a78985 /kernel/cgroup.c | |
| parent | 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 (diff) | |
| parent | 2c940db250c1610d95ea5331dc819b8bd4db96ae (diff) | |
| download | kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.zip kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.gz kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.bz2 | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 1fbcc74..aa3bee5 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2936,14 +2936,17 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry, for_each_subsys(root, ss) { struct cgroup_subsys_state *css = ss->create(ss, cgrp); + if (IS_ERR(css)) { err = PTR_ERR(css); goto err_destroy; } init_cgroup_css(css, ss, cgrp); - if (ss->use_id) - if (alloc_css_id(ss, parent, cgrp)) + if (ss->use_id) { + err = alloc_css_id(ss, parent, cgrp); + if (err) goto err_destroy; + } /* At error, ->destroy() callback has to free assigned ID. */ } |