cgroups: make sure the "devices" controller's enum is named the same way as the controller in the kernel
Follow-up to 5bf8002a3a
.
This commit is contained in:
parent
da323858ef
commit
3905f12713
|
@ -2211,7 +2211,7 @@ static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
|
||||||
[CGROUP_CONTROLLER_CPUACCT] = "cpuacct",
|
[CGROUP_CONTROLLER_CPUACCT] = "cpuacct",
|
||||||
[CGROUP_CONTROLLER_BLKIO] = "blkio",
|
[CGROUP_CONTROLLER_BLKIO] = "blkio",
|
||||||
[CGROUP_CONTROLLER_MEMORY] = "memory",
|
[CGROUP_CONTROLLER_MEMORY] = "memory",
|
||||||
[CGROUP_CONTROLLER_DEVICE] = "devices",
|
[CGROUP_CONTROLLER_DEVICES] = "devices",
|
||||||
};
|
};
|
||||||
|
|
||||||
DEFINE_STRING_TABLE_LOOKUP(cgroup_controller, CGroupController);
|
DEFINE_STRING_TABLE_LOOKUP(cgroup_controller, CGroupController);
|
||||||
|
|
|
@ -34,7 +34,7 @@ typedef enum CGroupController {
|
||||||
CGROUP_CONTROLLER_CPUACCT,
|
CGROUP_CONTROLLER_CPUACCT,
|
||||||
CGROUP_CONTROLLER_BLKIO,
|
CGROUP_CONTROLLER_BLKIO,
|
||||||
CGROUP_CONTROLLER_MEMORY,
|
CGROUP_CONTROLLER_MEMORY,
|
||||||
CGROUP_CONTROLLER_DEVICE,
|
CGROUP_CONTROLLER_DEVICES,
|
||||||
_CGROUP_CONTROLLER_MAX,
|
_CGROUP_CONTROLLER_MAX,
|
||||||
_CGROUP_CONTROLLER_INVALID = -1,
|
_CGROUP_CONTROLLER_INVALID = -1,
|
||||||
} CGroupController;
|
} CGroupController;
|
||||||
|
@ -47,7 +47,7 @@ typedef enum CGroupMask {
|
||||||
CGROUP_MASK_CPUACCT = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_CPUACCT),
|
CGROUP_MASK_CPUACCT = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_CPUACCT),
|
||||||
CGROUP_MASK_BLKIO = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_BLKIO),
|
CGROUP_MASK_BLKIO = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_BLKIO),
|
||||||
CGROUP_MASK_MEMORY = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_MEMORY),
|
CGROUP_MASK_MEMORY = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_MEMORY),
|
||||||
CGROUP_MASK_DEVICE = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_DEVICE),
|
CGROUP_MASK_DEVICES = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_DEVICES),
|
||||||
_CGROUP_MASK_ALL = CGROUP_CONTROLLER_TO_MASK(_CGROUP_CONTROLLER_MAX) - 1
|
_CGROUP_MASK_ALL = CGROUP_CONTROLLER_TO_MASK(_CGROUP_CONTROLLER_MAX) - 1
|
||||||
} CGroupMask;
|
} CGroupMask;
|
||||||
|
|
||||||
|
|
|
@ -404,7 +404,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupMask mask, const char *path, M
|
||||||
"Failed to set memory.limit_in_bytes/memory.max on %s: %m", path);
|
"Failed to set memory.limit_in_bytes/memory.max on %s: %m", path);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((mask & CGROUP_MASK_DEVICE) && !is_root) {
|
if ((mask & CGROUP_MASK_DEVICES) && !is_root) {
|
||||||
CGroupDeviceAllow *a;
|
CGroupDeviceAllow *a;
|
||||||
|
|
||||||
/* Changing the devices list of a populated cgroup
|
/* Changing the devices list of a populated cgroup
|
||||||
|
@ -492,7 +492,7 @@ CGroupMask cgroup_context_get_mask(CGroupContext *c) {
|
||||||
|
|
||||||
if (c->device_allow ||
|
if (c->device_allow ||
|
||||||
c->device_policy != CGROUP_AUTO)
|
c->device_policy != CGROUP_AUTO)
|
||||||
mask |= CGROUP_MASK_DEVICE;
|
mask |= CGROUP_MASK_DEVICES;
|
||||||
|
|
||||||
return mask;
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
|
@ -572,7 +572,7 @@ int bus_cgroup_set_property(
|
||||||
char *buf;
|
char *buf;
|
||||||
|
|
||||||
c->device_policy = p;
|
c->device_policy = p;
|
||||||
u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICE;
|
u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICES;
|
||||||
|
|
||||||
buf = strjoina("DevicePolicy=", policy);
|
buf = strjoina("DevicePolicy=", policy);
|
||||||
unit_write_drop_in_private(u, mode, name, buf);
|
unit_write_drop_in_private(u, mode, name, buf);
|
||||||
|
@ -651,7 +651,7 @@ int bus_cgroup_set_property(
|
||||||
cgroup_context_free_device_allow(c, c->device_allow);
|
cgroup_context_free_device_allow(c, c->device_allow);
|
||||||
}
|
}
|
||||||
|
|
||||||
u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICE;
|
u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICES;
|
||||||
|
|
||||||
f = open_memstream(&buf, &size);
|
f = open_memstream(&buf, &size);
|
||||||
if (!f)
|
if (!f)
|
||||||
|
|
Loading…
Reference in New Issue