Merge branch 'for-4.10-fixes' into for-4.11
This commit is contained in:
Коммит
bdf3d06bed
|
@ -4071,6 +4071,11 @@ err_free_css:
|
||||||
return ERR_PTR(err);
|
return ERR_PTR(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The returned cgroup is fully initialized including its control mask, but
|
||||||
|
* it isn't associated with its kernfs_node and doesn't have the control
|
||||||
|
* mask applied.
|
||||||
|
*/
|
||||||
static struct cgroup *cgroup_create(struct cgroup *parent)
|
static struct cgroup *cgroup_create(struct cgroup *parent)
|
||||||
{
|
{
|
||||||
struct cgroup_root *root = parent->root;
|
struct cgroup_root *root = parent->root;
|
||||||
|
@ -4138,11 +4143,6 @@ static struct cgroup *cgroup_create(struct cgroup *parent)
|
||||||
|
|
||||||
cgroup_propagate_control(cgrp);
|
cgroup_propagate_control(cgrp);
|
||||||
|
|
||||||
/* @cgrp doesn't have dir yet so the following will only create csses */
|
|
||||||
ret = cgroup_apply_control_enable(cgrp);
|
|
||||||
if (ret)
|
|
||||||
goto out_destroy;
|
|
||||||
|
|
||||||
return cgrp;
|
return cgrp;
|
||||||
|
|
||||||
out_cancel_ref:
|
out_cancel_ref:
|
||||||
|
@ -4150,9 +4150,6 @@ out_cancel_ref:
|
||||||
out_free_cgrp:
|
out_free_cgrp:
|
||||||
kfree(cgrp);
|
kfree(cgrp);
|
||||||
return ERR_PTR(ret);
|
return ERR_PTR(ret);
|
||||||
out_destroy:
|
|
||||||
cgroup_destroy_locked(cgrp);
|
|
||||||
return ERR_PTR(ret);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name, umode_t mode)
|
int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name, umode_t mode)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче