diff options
| author | J. Bruce Fields | 2010-03-04 18:03:16 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2010-03-04 18:04:51 +0100 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /kernel/cgroup.c | |
| parent | nfsd4: fix minor memory leak (diff) | |
| parent | Merge branch 'linux-2.6.33' (diff) | |
| download | kernel-qcow2-linux-4ea41e2de5bba756858bb40f964e3490b6d1a25c.tar.gz kernel-qcow2-linux-4ea41e2de5bba756858bb40f964e3490b6d1a25c.tar.xz kernel-qcow2-linux-4ea41e2de5bba756858bb40f964e3490b6d1a25c.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
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 1fbcc748044a..aa3bee566446 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. */ } |