2008-02-29 04:38:53

by Dhaval Giani

Subject: [patch 1/2] sched: cleanup cpuacct variable names

Change the variable names to the common convention for the cpuacct
subsystem.

Signed-off-by: Dhaval Giani <[email protected]>

---
kernel/sched.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)

Index: linux-2.6/kernel/sched.c
===================================================================
--- linux-2.6.orig/kernel/sched.c 2008-02-27 16:21:15.000000000 +0530
+++ linux-2.6/kernel/sched.c 2008-02-28 20:05:27.000000000 +0530
@@ -8180,9 +8180,9 @@ struct cpuacct {
struct cgroup_subsys cpuacct_subsys;

/* return cpu accounting group corresponding to this container */
-static inline struct cpuacct *cgroup_ca(struct cgroup *cont)
+static inline struct cpuacct *cgroup_ca(struct cgroup *cgrp)
{
- return container_of(cgroup_subsys_state(cont, cpuacct_subsys_id),
+ return container_of(cgroup_subsys_state(cgrp, cpuacct_subsys_id),
struct cpuacct, css);
}

@@ -8195,7 +8195,7 @@ static inline struct cpuacct *task_ca(st

/* create a new cpu accounting group */
static struct cgroup_subsys_state *cpuacct_create(
- struct cgroup_subsys *ss, struct cgroup *cont)
+ struct cgroup_subsys *ss, struct cgroup *cgrp)
{
struct cpuacct *ca = kzalloc(sizeof(*ca), GFP_KERNEL);

@@ -8213,18 +8213,18 @@ static struct cgroup_subsys_state *cpuac

/* destroy an existing cpu accounting group */
static void
-cpuacct_destroy(struct cgroup_subsys *ss, struct cgroup *cont)
+cpuacct_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
{
- struct cpuacct *ca = cgroup_ca(cont);
+ struct cpuacct *ca = cgroup_ca(cgrp);

free_percpu(ca->cpuusage);
kfree(ca);
}

/* return total cpu usage (in nanoseconds) of a group */
-static u64 cpuusage_read(struct cgroup *cont, struct cftype *cft)
+static u64 cpuusage_read(struct cgroup *cgrp, struct cftype *cft)
{
- struct cpuacct *ca = cgroup_ca(cont);
+ struct cpuacct *ca = cgroup_ca(cgrp);
u64 totalcpuusage = 0;
int i;

@@ -8250,9 +8250,9 @@ static struct cftype files[] = {
},
};

-static int cpuacct_populate(struct cgroup_subsys *ss, struct cgroup *cont)
+static int cpuacct_populate(struct cgroup_subsys *ss, struct cgroup *cgrp)
{
- return cgroup_add_files(cont, ss, files, ARRAY_SIZE(files));
+ return cgroup_add_files(cgrp, ss, files, ARRAY_SIZE(files));
}

/*

--
regards,
Dhaval

2008-03-07 05:00:30

by Balbir Singh

Subject: Re: [patch 1/2] sched: cleanup cpuacct variable names

* Dhaval Giani <[email protected]> [2008-02-29 10:02:43]:

> Change the variable names to the common convention for the cpuacct
> subsystem.
>
> Signed-off-by: Dhaval Giani <[email protected]>
>
> ---
> kernel/sched.c | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
>
> Index: linux-2.6/kernel/sched.c
> ===================================================================
> --- linux-2.6.orig/kernel/sched.c 2008-02-27 16:21:15.000000000 +0530
> +++ linux-2.6/kernel/sched.c 2008-02-28 20:05:27.000000000 +0530
> @@ -8180,9 +8180,9 @@ struct cpuacct {
> struct cgroup_subsys cpuacct_subsys;
>
> /* return cpu accounting group corresponding to this container */
> -static inline struct cpuacct *cgroup_ca(struct cgroup *cont)
> +static inline struct cpuacct *cgroup_ca(struct cgroup *cgrp)
> {
> - return container_of(cgroup_subsys_state(cont, cpuacct_subsys_id),
> + return container_of(cgroup_subsys_state(cgrp, cpuacct_subsys_id),
> struct cpuacct, css);
> }
>
> @@ -8195,7 +8195,7 @@ static inline struct cpuacct *task_ca(st
>
> /* create a new cpu accounting group */
> static struct cgroup_subsys_state *cpuacct_create(
> - struct cgroup_subsys *ss, struct cgroup *cont)
> + struct cgroup_subsys *ss, struct cgroup *cgrp)
> {
> struct cpuacct *ca = kzalloc(sizeof(*ca), GFP_KERNEL);
>
> @@ -8213,18 +8213,18 @@ static struct cgroup_subsys_state *cpuac
>
> /* destroy an existing cpu accounting group */
> static void
> -cpuacct_destroy(struct cgroup_subsys *ss, struct cgroup *cont)
> +cpuacct_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
> {
> - struct cpuacct *ca = cgroup_ca(cont);
> + struct cpuacct *ca = cgroup_ca(cgrp);
>
> free_percpu(ca->cpuusage);
> kfree(ca);
> }
>
> /* return total cpu usage (in nanoseconds) of a group */
> -static u64 cpuusage_read(struct cgroup *cont, struct cftype *cft)
> +static u64 cpuusage_read(struct cgroup *cgrp, struct cftype *cft)
> {
> - struct cpuacct *ca = cgroup_ca(cont);
> + struct cpuacct *ca = cgroup_ca(cgrp);
> u64 totalcpuusage = 0;
> int i;
>
> @@ -8250,9 +8250,9 @@ static struct cftype files[] = {
> },
> };
>
> -static int cpuacct_populate(struct cgroup_subsys *ss, struct cgroup *cont)
> +static int cpuacct_populate(struct cgroup_subsys *ss, struct cgroup *cgrp)
> {
> - return cgroup_add_files(cont, ss, files, ARRAY_SIZE(files));
> + return cgroup_add_files(cgrp, ss, files, ARRAY_SIZE(files));
> }
>
> /*
>
>

Looks good

Acked-by: Balbir Singh <[email protected]>

--
Warm Regards,
Balbir Singh
Linux Technology Center
IBM, ISTL

2008-03-07 08:59:25

by Ingo Molnar

Subject: Re: [patch 1/2] sched: cleanup cpuacct variable names

* Dhaval Giani <[email protected]> wrote:

> Change the variable names to the common convention for the cpuacct
> subsystem.
>
> Signed-off-by: Dhaval Giani <[email protected]>

thanks, applied.

Ingo