diff options
| author | Tejun Heo <tj@kernel.org> | 2012-04-01 15:09:55 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-04-01 15:09:55 -0400 |
| commit | 4baf6e33251b37f111e21289f8ee71fe4cce236e (patch) | |
| tree | 7decc386a60679fd2696041810cf331c0daf1f41 /security | |
| parent | 676f7c8f84d15e94065841529016da5ab92e901b (diff) | |
cgroup: convert all non-memcg controllers to the new cftype interface
Convert debug, freezer, cpuset, cpu_cgroup, cpuacct, net_prio, blkio,
net_cls and device controllers to use the new cftype based interface.
Termination entry is added to cftype arrays and populate callbacks are
replaced with cgroup_subsys->base_cftypes initializations.
This is functionally identical transformation. There shouldn't be any
visible behavior change.
memcg is rather special and will be converted separately.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Paul Menage <paul@paulmenage.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Vivek Goyal <vgoyal@redhat.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/device_cgroup.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index c43a3323feea..442204cc22d9 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
| @@ -447,22 +447,16 @@ static struct cftype dev_cgroup_files[] = { | |||
| 447 | .read_seq_string = devcgroup_seq_read, | 447 | .read_seq_string = devcgroup_seq_read, |
| 448 | .private = DEVCG_LIST, | 448 | .private = DEVCG_LIST, |
| 449 | }, | 449 | }, |
| 450 | { } /* terminate */ | ||
| 450 | }; | 451 | }; |
| 451 | 452 | ||
| 452 | static int devcgroup_populate(struct cgroup_subsys *ss, | ||
| 453 | struct cgroup *cgroup) | ||
| 454 | { | ||
| 455 | return cgroup_add_files(cgroup, ss, dev_cgroup_files, | ||
| 456 | ARRAY_SIZE(dev_cgroup_files)); | ||
| 457 | } | ||
| 458 | |||
| 459 | struct cgroup_subsys devices_subsys = { | 453 | struct cgroup_subsys devices_subsys = { |
| 460 | .name = "devices", | 454 | .name = "devices", |
| 461 | .can_attach = devcgroup_can_attach, | 455 | .can_attach = devcgroup_can_attach, |
| 462 | .create = devcgroup_create, | 456 | .create = devcgroup_create, |
| 463 | .destroy = devcgroup_destroy, | 457 | .destroy = devcgroup_destroy, |
| 464 | .populate = devcgroup_populate, | ||
| 465 | .subsys_id = devices_subsys_id, | 458 | .subsys_id = devices_subsys_id, |
| 459 | .base_cftypes = dev_cgroup_files, | ||
| 466 | }; | 460 | }; |
| 467 | 461 | ||
| 468 | int __devcgroup_inode_permission(struct inode *inode, int mask) | 462 | int __devcgroup_inode_permission(struct inode *inode, int mask) |
