diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-08 18:15:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-08 18:15:50 +0200 |
| commit | 3905f12713df17195118d9caa321299d963ee315 (patch) | |
| tree | 6665066944fc02697e9b3ca555fa9a27e11e089a /src/basic | |
| parent | da323858ef34a0216aa96f4089810053c90f09ce (diff) | |
cgroups: make sure the "devices" controller's enum is named the same way as the controller in the kernel
Follow-up to 5bf8002a3a6723ce50331c024122078552fb600a.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/cgroup-util.c | 2 | ||||
| -rw-r--r-- | src/basic/cgroup-util.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index f661a54d99..94a25585b2 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2211,7 +2211,7 @@ static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = { [CGROUP_CONTROLLER_CPUACCT] = "cpuacct", [CGROUP_CONTROLLER_BLKIO] = "blkio", [CGROUP_CONTROLLER_MEMORY] = "memory", - [CGROUP_CONTROLLER_DEVICE] = "devices", + [CGROUP_CONTROLLER_DEVICES] = "devices", }; DEFINE_STRING_TABLE_LOOKUP(cgroup_controller, CGroupController); diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 6fd6d80590..16d439fd9d 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -34,7 +34,7 @@ typedef enum CGroupController { CGROUP_CONTROLLER_CPUACCT, CGROUP_CONTROLLER_BLKIO, CGROUP_CONTROLLER_MEMORY, - CGROUP_CONTROLLER_DEVICE, + CGROUP_CONTROLLER_DEVICES, _CGROUP_CONTROLLER_MAX, _CGROUP_CONTROLLER_INVALID = -1, } CGroupController; @@ -47,7 +47,7 @@ typedef enum CGroupMask { CGROUP_MASK_CPUACCT = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_CPUACCT), CGROUP_MASK_BLKIO = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_BLKIO), 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 } CGroupMask; |