Merge pull request #2626 from brauner/2018-09-20/remove_locking

lxccontainer: remove cgroup locking
This commit is contained in:
Stéphane Graber 2018-09-21 00:11:43 +02:00 committed by GitHub
commit 2eea260752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3277,13 +3277,8 @@ static bool do_lxcapi_set_cgroup_item(struct lxc_container *c, const char *subsy
if (!cgroup_ops) if (!cgroup_ops)
return false; return false;
if (container_disk_lock(c))
return false;
ret = cgroup_ops->set(cgroup_ops, subsys, value, c->name, c->config_path); ret = cgroup_ops->set(cgroup_ops, subsys, value, c->name, c->config_path);
container_disk_unlock(c);
cgroup_exit(cgroup_ops); cgroup_exit(cgroup_ops);
return ret == 0; return ret == 0;
@ -3306,14 +3301,9 @@ static int do_lxcapi_get_cgroup_item(struct lxc_container *c, const char *subsys
if (!cgroup_ops) if (!cgroup_ops)
return -1; return -1;
if (container_disk_lock(c))
return -1;
ret = cgroup_ops->get(cgroup_ops, subsys, retv, inlen, c->name, ret = cgroup_ops->get(cgroup_ops, subsys, retv, inlen, c->name,
c->config_path); c->config_path);
container_disk_unlock(c);
cgroup_exit(cgroup_ops); cgroup_exit(cgroup_ops);
return ret; return ret;