[PATCH] cgroup: fix sparse warning of shadow symbol in cgroup.c

[PATCH] cgroup: fix sparse warning of shadow symbol in cgroup.c

[Paul Jackson]

From: Paul Jackson <pj@sgi.com>

Fix a code warning: symbol 'p' shadows an earlier one

This is a reincarnation of Harvey Harrison's patch:
	cpuset: sparse warnings in cpuset.c

Independently, Cliff Wickman moved the affected code,
from kernel/cpuset.c to kernel/cgroup.c, in his patch:
	cpusets: update_cpumask revision

Signed-off-by: Paul Jackson <pj@sgi.com>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Cliff Wickman <cpw@sgi.com>

---
 kernel/cgroup.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- 2.6.25-rc2-mm1.orig/kernel/cgroup.c	2008-02-16 01:04:48.000000000 -0800
+++ 2.6.25-rc2-mm1/kernel/cgroup.c	2008-02-23 04:19:44.006614677 -0800
@@ -1897,14 +1897,14 @@ int cgroup_scan_tasks(struct cgroup_scan
 
 	if (heap->size) {
 		for (i = 0; i < heap->size; i++) {
-			struct task_struct *p = heap->ptrs[i];
+			struct task_struct *q = heap->ptrs[i];
 			if (i == 0) {
-				latest_time = p->start_time;
-				latest_task = p;
+				latest_time = q->start_time;
+				latest_task = q;
 			}
 			/* Process the task per the caller's callback */
-			scan->process_task(p, scan);
-			put_task_struct(p);
+			scan->process_task(q, scan);
+			put_task_struct(q);
 		}
 		/*
 		 * If we had to process any tasks at all, scan again

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

Re: [PATCH] cgroup: fix sparse warning of shadow symbol in cgroup.c

[Paul Menage]

On Sat, Feb 23, 2008 at 4:33 AM, Paul Jackson <pj@sgi.com> wrote:
> From: Paul Jackson <pj@sgi.com>
>
>  Fix a code warning: symbol 'p' shadows an earlier one
>
>  This is a reincarnation of Harvey Harrison's patch:
>         cpuset: sparse warnings in cpuset.c
>
>  Independently, Cliff Wickman moved the affected code,
>  from kernel/cpuset.c to kernel/cgroup.c, in his patch:
>         cpusets: update_cpumask revision
>
>  Signed-off-by: Paul Jackson <pj@sgi.com>

Acked-by: Paul Menage <menage@google.com>

>  Cc: Harvey Harrison <harvey.harrison@gmail.com>
>  Cc: Cliff Wickman <cpw@sgi.com>
>
>  ---
>   kernel/cgroup.c |   10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
>  --- 2.6.25-rc2-mm1.orig/kernel/cgroup.c 2008-02-16 01:04:48.000000000 -0800
>  +++ 2.6.25-rc2-mm1/kernel/cgroup.c      2008-02-23 04:19:44.006614677 -0800
>  @@ -1897,14 +1897,14 @@ int cgroup_scan_tasks(struct cgroup_scan
>
>         if (heap->size) {
>                 for (i = 0; i < heap->size; i++) {
>  -                       struct task_struct *p = heap->ptrs[i];
>  +                       struct task_struct *q = heap->ptrs[i];
>                         if (i == 0) {
>  -                               latest_time = p->start_time;
>  -                               latest_task = p;
>  +                               latest_time = q->start_time;
>  +                               latest_task = q;
>                         }
>                         /* Process the task per the caller's callback */
>  -                       scan->process_task(p, scan);
>  -                       put_task_struct(p);
>  +                       scan->process_task(q, scan);
>  +                       put_task_struct(q);
>                 }
>                 /*
>                  * If we had to process any tasks at all, scan again
>
>  --
>                           I won't rest till it's the best ...
>                           Programmer, Linux Scalability
>                           Paul Jackson <pj@sgi.com> 1.650.933.1373
>