* [PATCH ] cgroup: rename cont to cgrp
@ 2013-06-14 3:17 ` Li Zefan
0 siblings, 0 replies; 8+ messages in thread
From: Li Zefan @ 2013-06-14 3:17 UTC (permalink / raw)
To: Tejun Heo; +Cc: LKML, Cgroups, Containers
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 <lizefan@huawei.com>
---
I'll clean up this for memcg later.
---
include/linux/cgroup.h | 4 ++--
kernel/cgroup.c | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index b7bd4be..9f6e26a 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -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,
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index dd4ab91..25f1054 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -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;
--
1.8.0.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH ] cgroup: rename cont to cgrp
@ 2013-06-14 3:17 ` Li Zefan
0 siblings, 0 replies; 8+ messages in thread
From: Li Zefan @ 2013-06-14 3:17 UTC (permalink / raw)
To: Tejun Heo; +Cc: LKML, Cgroups, Containers
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 <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
I'll clean up this for memcg later.
---
include/linux/cgroup.h | 4 ++--
kernel/cgroup.c | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index b7bd4be..9f6e26a 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -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,
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index dd4ab91..25f1054 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -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;
--
1.8.0.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH ] cgroup: rename cont to cgrp
[not found] ` <51BA8B3F.3060606-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2013-06-19 1:31 ` Li Zefan
0 siblings, 0 replies; 8+ messages in thread
From: Li Zefan @ 2013-06-19 1:31 UTC (permalink / raw)
To: Tejun Heo; +Cc: Cgroups, Containers, LKML
Hi Tejun,
Could you apply this patch?
On 2013/6/14 11:17, Li Zefan wrote:
> 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 <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> ---
>
> I'll clean up this for memcg later.
>
> ---
> include/linux/cgroup.h | 4 ++--
> kernel/cgroup.c | 22 +++++++++++-----------
> 2 files changed, 13 insertions(+), 13 deletions(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH ] cgroup: rename cont to cgrp
[not found] ` <51BA8B3F.3060606-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2013-06-19 1:31 ` Li Zefan
0 siblings, 0 replies; 8+ messages in thread
From: Li Zefan @ 2013-06-19 1:31 UTC (permalink / raw)
To: Tejun Heo; +Cc: LKML, Cgroups, Containers
Hi Tejun,
Could you apply this patch?
On 2013/6/14 11:17, Li Zefan wrote:
> 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 <lizefan@huawei.com>
> ---
>
> I'll clean up this for memcg later.
>
> ---
> include/linux/cgroup.h | 4 ++--
> kernel/cgroup.c | 22 +++++++++++-----------
> 2 files changed, 13 insertions(+), 13 deletions(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH ] cgroup: rename cont to cgrp
@ 2013-06-19 1:31 ` Li Zefan
0 siblings, 0 replies; 8+ messages in thread
From: Li Zefan @ 2013-06-19 1:31 UTC (permalink / raw)
To: Tejun Heo; +Cc: LKML, Cgroups, Containers
Hi Tejun,
Could you apply this patch?
On 2013/6/14 11:17, Li Zefan wrote:
> 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 <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> ---
>
> I'll clean up this for memcg later.
>
> ---
> include/linux/cgroup.h | 4 ++--
> kernel/cgroup.c | 22 +++++++++++-----------
> 2 files changed, 13 insertions(+), 13 deletions(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH ] cgroup: rename cont to cgrp
2013-06-19 1:31 ` Li Zefan
@ 2013-06-19 8:23 ` Tejun Heo
-1 siblings, 0 replies; 8+ messages in thread
From: Tejun Heo @ 2013-06-19 8:23 UTC (permalink / raw)
To: Li Zefan; +Cc: Cgroups, Containers, LKML
On Wed, Jun 19, 2013 at 09:31:10AM +0800, Li Zefan wrote:
> Hi Tejun,
>
> Could you apply this patch?
Oops, I thought I applied this one. Apparently not.
> On 2013/6/14 11:17, Li Zefan wrote:
> > 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 <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
Applied to cgroup/for-3.11.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH ] cgroup: rename cont to cgrp
@ 2013-06-19 8:23 ` Tejun Heo
0 siblings, 0 replies; 8+ messages in thread
From: Tejun Heo @ 2013-06-19 8:23 UTC (permalink / raw)
To: Li Zefan; +Cc: LKML, Cgroups, Containers
On Wed, Jun 19, 2013 at 09:31:10AM +0800, Li Zefan wrote:
> Hi Tejun,
>
> Could you apply this patch?
Oops, I thought I applied this one. Apparently not.
> On 2013/6/14 11:17, Li Zefan wrote:
> > 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 <lizefan@huawei.com>
Applied to cgroup/for-3.11.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH ] cgroup: rename cont to cgrp
@ 2013-06-14 3:17 Li Zefan
0 siblings, 0 replies; 8+ messages in thread
From: Li Zefan @ 2013-06-14 3:17 UTC (permalink / raw)
To: Tejun Heo; +Cc: Cgroups, Containers, LKML
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 <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
I'll clean up this for memcg later.
---
include/linux/cgroup.h | 4 ++--
kernel/cgroup.c | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index b7bd4be..9f6e26a 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -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,
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index dd4ab91..25f1054 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -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;
--
1.8.0.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-06-19 8:23 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-14 3:17 [PATCH ] cgroup: rename cont to cgrp Li Zefan
2013-06-14 3:17 ` Li Zefan
2013-06-19 1:31 ` Li Zefan
2013-06-19 1:31 ` Li Zefan
[not found] ` <51C109DE.8010607-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-06-19 8:23 ` Tejun Heo
2013-06-19 8:23 ` Tejun Heo
[not found] ` <51BA8B3F.3060606-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-06-19 1:31 ` Li Zefan
2013-06-14 3:17 Li Zefan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.