diff options
| author | Tejun Heo <tj@kernel.org> | 2013-07-09 19:17:39 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-07-09 19:30:35 -0400 |
| commit | add0c59d802e6118e51e21244c3871be35164e4b (patch) | |
| tree | 3059bc2b0cd06a6e094a34474aaa7fc4920e028d | |
| parent | a82a729f04232ccd0b59406574ba4cf20027a49d (diff) | |
cgroup: remove bcache_subsys_id which got added stealthily
cafe563591 ("bcache: A block layer cache") added a new cgroup
subsystem bcache_subsys without proper review and ack. bcache_subsys
seems to use cgroup for group stats and per-group cache_mode
configuration. This is very much the type of usage that we don't want
to allow.
Fortunately, CONFIG_CGROUP_BCACHE which enables bcache_subsys is
currently commented out, so this shouldn't have any upstream users.
Let's nip in the bud. While at it, clarify in cgroup_subsys.h that no
new subsystem should be added without explicit acks from cgroup
maintainers.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: cgroups@vger.kernel.org
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-bcache@vger.kernel.org
| -rw-r--r-- | include/linux/cgroup_subsys.h | 45 |
1 files changed, 7 insertions, 38 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index 6e7ec64b69ab..b613ffd402d1 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h | |||
| @@ -1,86 +1,55 @@ | |||
| 1 | /* Add subsystem definitions of the form SUBSYS(<name>) in this | 1 | /* |
| 2 | * file. Surround each one by a line of comment markers so that | 2 | * List of cgroup subsystems. |
| 3 | * patches don't collide | 3 | * |
| 4 | * DO NOT ADD ANY SUBSYSTEM WITHOUT EXPLICIT ACKS FROM CGROUP MAINTAINERS. | ||
| 4 | */ | 5 | */ |
| 5 | |||
| 6 | /* */ | ||
| 7 | |||
| 8 | /* */ | ||
| 9 | |||
| 10 | #if IS_SUBSYS_ENABLED(CONFIG_CPUSETS) | 6 | #if IS_SUBSYS_ENABLED(CONFIG_CPUSETS) |
| 11 | SUBSYS(cpuset) | 7 | SUBSYS(cpuset) |
| 12 | #endif | 8 | #endif |
| 13 | 9 | ||
| 14 | /* */ | ||
| 15 | |||
| 16 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_DEBUG) | 10 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_DEBUG) |
| 17 | SUBSYS(debug) | 11 | SUBSYS(debug) |
| 18 | #endif | 12 | #endif |
| 19 | 13 | ||
| 20 | /* */ | ||
| 21 | |||
| 22 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_SCHED) | 14 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_SCHED) |
| 23 | SUBSYS(cpu_cgroup) | 15 | SUBSYS(cpu_cgroup) |
| 24 | #endif | 16 | #endif |
| 25 | 17 | ||
| 26 | /* */ | ||
| 27 | |||
| 28 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_CPUACCT) | 18 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_CPUACCT) |
| 29 | SUBSYS(cpuacct) | 19 | SUBSYS(cpuacct) |
| 30 | #endif | 20 | #endif |
| 31 | 21 | ||
| 32 | /* */ | ||
| 33 | |||
| 34 | #if IS_SUBSYS_ENABLED(CONFIG_MEMCG) | 22 | #if IS_SUBSYS_ENABLED(CONFIG_MEMCG) |
| 35 | SUBSYS(mem_cgroup) | 23 | SUBSYS(mem_cgroup) |
| 36 | #endif | 24 | #endif |
| 37 | 25 | ||
| 38 | /* */ | ||
| 39 | |||
| 40 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_DEVICE) | 26 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_DEVICE) |
| 41 | SUBSYS(devices) | 27 | SUBSYS(devices) |
| 42 | #endif | 28 | #endif |
| 43 | 29 | ||
| 44 | /* */ | ||
| 45 | |||
| 46 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_FREEZER) | 30 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_FREEZER) |
| 47 | SUBSYS(freezer) | 31 | SUBSYS(freezer) |
| 48 | #endif | 32 | #endif |
| 49 | 33 | ||
| 50 | /* */ | ||
| 51 | |||
| 52 | #if IS_SUBSYS_ENABLED(CONFIG_NET_CLS_CGROUP) | 34 | #if IS_SUBSYS_ENABLED(CONFIG_NET_CLS_CGROUP) |
| 53 | SUBSYS(net_cls) | 35 | SUBSYS(net_cls) |
| 54 | #endif | 36 | #endif |
| 55 | 37 | ||
| 56 | /* */ | ||
| 57 | |||
| 58 | #if IS_SUBSYS_ENABLED(CONFIG_BLK_CGROUP) | 38 | #if IS_SUBSYS_ENABLED(CONFIG_BLK_CGROUP) |
| 59 | SUBSYS(blkio) | 39 | SUBSYS(blkio) |
| 60 | #endif | 40 | #endif |
| 61 | 41 | ||
| 62 | /* */ | ||
| 63 | |||
| 64 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_PERF) | 42 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_PERF) |
| 65 | SUBSYS(perf) | 43 | SUBSYS(perf) |
| 66 | #endif | 44 | #endif |
| 67 | 45 | ||
| 68 | /* */ | ||
| 69 | |||
| 70 | #if IS_SUBSYS_ENABLED(CONFIG_NETPRIO_CGROUP) | 46 | #if IS_SUBSYS_ENABLED(CONFIG_NETPRIO_CGROUP) |
| 71 | SUBSYS(net_prio) | 47 | SUBSYS(net_prio) |
| 72 | #endif | 48 | #endif |
| 73 | 49 | ||
| 74 | /* */ | ||
| 75 | |||
| 76 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_HUGETLB) | 50 | #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_HUGETLB) |
| 77 | SUBSYS(hugetlb) | 51 | SUBSYS(hugetlb) |
| 78 | #endif | 52 | #endif |
| 79 | 53 | /* | |
| 80 | /* */ | 54 | * DO NOT ADD ANY SUBSYSTEM WITHOUT EXPLICIT ACKS FROM CGROUP MAINTAINERS. |
| 81 | 55 | */ | |
| 82 | #ifdef CONFIG_CGROUP_BCACHE | ||
| 83 | SUBSYS(bcache) | ||
| 84 | #endif | ||
| 85 | |||
| 86 | /* */ | ||
