cgroup: rename cont to cgrp
PATCH 1/1 cgroup: rename cont to cgrp
Cont is short for container. control group was named process container at first, but then people found container already has a meaning in linux kernel.
Clean up the leftover variable name @cont.
---
I'll clean up this for memcg later.
--- include/linux/cgroup.h | 4 ++-- kernel/cgroup.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-)
include/linux/cgroup.h +2 -2
@@ -436,13 +436,13 @@ struct cftype {* entry. The key/value pairs (and their ordering) should not * change between reboots. */ -int (*read_map)(struct cgroup *cont,struct cftype *cft, +int (*read_map)(struct cgroup *cgrp,struct cftype *cft,struct cgroup_map_cb *cb);/* * read_seq_string() is used for outputting a simple sequence * using seqfile. */ -int (*read_seq_string)(struct cgroup *cont,struct cftype *cft, +int (*read_seq_string)(struct cgroup *cgrp,struct cftype *cft,struct seq_file *m); ssize_t (*write)(struct cgroup *cgrp, struct cftype *cft,
kernel/cgroup.c +11 -11
@@ -5473,7 +5473,7 @@ struct cgroup_subsys_state *cgroup_css_from_dir(struct file *f, int id) }#ifdef CONFIG_CGROUP_DEBUG -static struct cgroup_subsys_state *debug_css_alloc (struct cgroup *cont) +static struct cgroup_subsys_state *debug_css_alloc (struct cgroup *cgrp) {struct cgroup_subsys_state *css =kzalloc (sizeof (*css),GFP_KERNEL );
@@ -5483,23 +5483,23 @@ static struct cgroup_subsys_state *debug_css_alloc(struct cgroup *cont)return css; } -static void debug_css_free (struct cgroup *cont) +static void debug_css_free (struct cgroup *cgrp) { -kfree (cont->subsys[debug_subsys_id]); +kfree (cgrp->subsys[debug_subsys_id]); } -static u64 debug_taskcount_read (struct cgroup *cont,struct cftype *cft) +static u64 debug_taskcount_read (struct cgroup *cgrp,struct cftype *cft) { -return cgroup_task_count (cont); +return cgroup_task_count (cgrp); } -static u64 current_css_set_read (struct cgroup *cont,struct cftype *cft) +static u64 current_css_set_read (struct cgroup *cgrp,struct cftype *cft) {return (u64 )(unsigned long )current->cgroups; } -static u64 current_css_set_refcount_read (struct cgroup *cont, -struct cftype *cft) +static u64 current_css_set_refcount_read (struct cgroup *cgrp, +struct cftype *cft) {u64 count;
@@ -5509,7 +5509,7 @@ static u64 current_css_set_refcount_read(struct cgroup *cont,return count; } -static int current_css_set_cg_links_read (struct cgroup *cont, +static int current_css_set_cg_links_read (struct cgroup *cgrp,struct cftype *cft,struct seq_file *seq) {
@@ -5536,14 +5536,14 @@ static int current_css_set_cg_links_read(struct cgroup *cont, }#define MAX_TASKS_SHOWN_PER_CSS 25 -static int cgroup_css_links_read (struct cgroup *cont, +static int cgroup_css_links_read (struct cgroup *cgrp,struct cftype *cft,struct seq_file *seq) {struct cgrp_cset_link *link;read_lock (&css_set_lock); -list_for_each_entry (link, &cont->cset_links, cset_link) { +list_for_each_entry (link, &cgrp->cset_links, cset_link) {struct css_set *cset = link->cset;struct task_struct *task;int count =0 ;
Signature · 1 line
1.8.0.2
Hi Tejun,
Could you apply this patch?
Quoted 16 lines · Li Zefan
Cont is short for container. control group was named process container at first, but then people found container already has a meaning in linux kernel.
Clean up the leftover variable name @cont.
Signed-off-by Li Zefan <[email protected]>---
I'll clean up this for memcg later.
--- include/linux/cgroup.h | 4 ++-- kernel/cgroup.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-)
Quoted 3 lines · Li Zefan
Hi Tejun,
Could you apply this patch?
Oops, I thought I applied this one. Apparently not.
Quoted 8 lines · Li Zefan
Quoted 7 lines
Cont is short for container. control group was named process container at first, but then people found container already has a meaning in linux kernel.
Clean up the leftover variable name @cont.
Signed-off-by Li Zefan <[email protected]>
Applied to cgroup/for-3.11.
Thanks.
Signature · 1 line
tejun
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi Tejun,
Could you apply this patch?
Quoted 16 lines · Li Zefan
Cont is short for container. control group was named process container at first, but then people found container already has a meaning in linux kernel.
Clean up the leftover variable name @cont.
Signed-off-by Li Zefan <[email protected]>---
I'll clean up this for memcg later.
--- include/linux/cgroup.h | 4 ++-- kernel/cgroup.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-)