* [PATCH] slub: fix shadowed variable sparse warnings @ 2008-01-31 4:23 Harvey Harrison 2008-01-31 4:28 ` Christoph Lameter 0 siblings, 1 reply; 3+ messages in thread From: Harvey Harrison @ 2008-01-31 4:23 UTC (permalink / raw) To: Christoph Lameter; +Cc: LKML Use *nd for *n: mm/slub.c:3406:26: warning: symbol 'n' shadows an earlier one mm/slub.c:3393:6: originally declared here No need to declare new node: mm/slub.c:3501:7: warning: symbol 'node' shadows an earlier one mm/slub.c:3491:6: originally declared here No need to declare new x: mm/slub.c:3513:9: warning: symbol 'x' shadows an earlier one mm/slub.c:3492:6: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> --- mm/slub.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 5cc4b7d..f9a20bf 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3403,19 +3403,19 @@ static int list_locations(struct kmem_cache *s, char *buf, flush_all(s); for_each_node_state(node, N_NORMAL_MEMORY) { - struct kmem_cache_node *n = get_node(s, node); + struct kmem_cache_node *nd = get_node(s, node); unsigned long flags; struct page *page; - if (!atomic_long_read(&n->nr_slabs)) + if (!atomic_long_read(&nd->nr_slabs)) continue; - spin_lock_irqsave(&n->list_lock, flags); - list_for_each_entry(page, &n->partial, lru) + spin_lock_irqsave(&nd->list_lock, flags); + list_for_each_entry(page, &nd->partial, lru) process_slab(&t, s, page, alloc); - list_for_each_entry(page, &n->full, lru) + list_for_each_entry(page, &nd->full, lru) process_slab(&t, s, page, alloc); - spin_unlock_irqrestore(&n->list_lock, flags); + spin_unlock_irqrestore(&nd->list_lock, flags); } for (i = 0; i < t.count; i++) { @@ -3498,7 +3498,6 @@ static unsigned long slab_objects(struct kmem_cache *s, for_each_possible_cpu(cpu) { struct page *page; - int node; struct kmem_cache_cpu *c = get_cpu_slab(s, cpu); if (!c) @@ -3510,8 +3509,6 @@ static unsigned long slab_objects(struct kmem_cache *s, continue; if (page) { if (flags & SO_CPU) { - int x = 0; - if (flags & SO_OBJECTS) x = page->inuse; else -- 1.5.4.rc4.1142.gf5a97 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] slub: fix shadowed variable sparse warnings 2008-01-31 4:23 [PATCH] slub: fix shadowed variable sparse warnings Harvey Harrison @ 2008-01-31 4:28 ` Christoph Lameter 2008-01-31 4:40 ` [PATCHv2] " Harvey Harrison 0 siblings, 1 reply; 3+ messages in thread From: Christoph Lameter @ 2008-01-31 4:28 UTC (permalink / raw) To: Harvey Harrison; +Cc: LKML On Wed, 30 Jan 2008, Harvey Harrison wrote: > Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> > --- > mm/slub.c | 15 ++++++--------- > 1 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index 5cc4b7d..f9a20bf 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3403,19 +3403,19 @@ static int list_locations(struct kmem_cache *s, char *buf, > flush_all(s); > > for_each_node_state(node, N_NORMAL_MEMORY) { > - struct kmem_cache_node *n = get_node(s, node); > + struct kmem_cache_node *nd = get_node(s, node); > unsigned long flags; > struct page *page; > > - if (!atomic_long_read(&n->nr_slabs)) > + if (!atomic_long_read(&nd->nr_slabs)) > continue; > > - spin_lock_irqsave(&n->list_lock, flags); > - list_for_each_entry(page, &n->partial, lru) > + spin_lock_irqsave(&nd->list_lock, flags); > + list_for_each_entry(page, &nd->partial, lru) > process_slab(&t, s, page, alloc); > - list_for_each_entry(page, &n->full, lru) > + list_for_each_entry(page, &nd->full, lru) > process_slab(&t, s, page, alloc); > - spin_unlock_irqrestore(&n->list_lock, flags); > + spin_unlock_irqrestore(&nd->list_lock, flags); > } Could you rename the outer variable instead? That is a counter. So call this count or something. The n is used throughout to refer to kmem_cache_node structs. > for (i = 0; i < t.count; i++) { > @@ -3498,7 +3498,6 @@ static unsigned long slab_objects(struct kmem_cache *s, > > for_each_possible_cpu(cpu) { > struct page *page; > - int node; > struct kmem_cache_cpu *c = get_cpu_slab(s, cpu); > > if (!c) That is okay. > @@ -3510,8 +3509,6 @@ static unsigned long slab_objects(struct kmem_cache *s, > continue; > if (page) { > if (flags & SO_CPU) { > - int x = 0; > - > if (flags & SO_OBJECTS) > x = page->inuse; > else Ok too. ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCHv2] slub: fix shadowed variable sparse warnings 2008-01-31 4:28 ` Christoph Lameter @ 2008-01-31 4:40 ` Harvey Harrison 0 siblings, 0 replies; 3+ messages in thread From: Harvey Harrison @ 2008-01-31 4:40 UTC (permalink / raw) To: Christoph Lameter; +Cc: LKML Introduce 'len' at outer level: mm/slub.c:3406:26: warning: symbol 'n' shadows an earlier one mm/slub.c:3393:6: originally declared here No need to declare new node: mm/slub.c:3501:7: warning: symbol 'node' shadows an earlier one mm/slub.c:3491:6: originally declared here No need to declare new x: mm/slub.c:3513:9: warning: symbol 'x' shadows an earlier one mm/slub.c:3492:6: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> --- mm/slub.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 5cc4b7d..93f5c28 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3390,7 +3390,7 @@ static void process_slab(struct loc_track *t, struct kmem_cache *s, static int list_locations(struct kmem_cache *s, char *buf, enum track_item alloc) { - int n = 0; + int len = 0; unsigned long i; struct loc_track t = { 0, 0, NULL }; int node; @@ -3421,54 +3421,54 @@ static int list_locations(struct kmem_cache *s, char *buf, for (i = 0; i < t.count; i++) { struct location *l = &t.loc[i]; - if (n > PAGE_SIZE - 100) + if (len > PAGE_SIZE - 100) break; - n += sprintf(buf + n, "%7ld ", l->count); + len += sprintf(buf + len, "%7ld ", l->count); if (l->addr) - n += sprint_symbol(buf + n, (unsigned long)l->addr); + len += sprint_symbol(buf + len, (unsigned long)l->addr); else - n += sprintf(buf + n, "<not-available>"); + len += sprintf(buf + len, "<not-available>"); if (l->sum_time != l->min_time) { unsigned long remainder; - n += sprintf(buf + n, " age=%ld/%ld/%ld", + len += sprintf(buf + len, " age=%ld/%ld/%ld", l->min_time, div_long_long_rem(l->sum_time, l->count, &remainder), l->max_time); } else - n += sprintf(buf + n, " age=%ld", + len += sprintf(buf + len, " age=%ld", l->min_time); if (l->min_pid != l->max_pid) - n += sprintf(buf + n, " pid=%ld-%ld", + len += sprintf(buf + len, " pid=%ld-%ld", l->min_pid, l->max_pid); else - n += sprintf(buf + n, " pid=%ld", + len += sprintf(buf + len, " pid=%ld", l->min_pid); if (num_online_cpus() > 1 && !cpus_empty(l->cpus) && - n < PAGE_SIZE - 60) { - n += sprintf(buf + n, " cpus="); - n += cpulist_scnprintf(buf + n, PAGE_SIZE - n - 50, + len < PAGE_SIZE - 60) { + len += sprintf(buf + len, " cpus="); + len += cpulist_scnprintf(buf + len, PAGE_SIZE - len - 50, l->cpus); } if (num_online_nodes() > 1 && !nodes_empty(l->nodes) && - n < PAGE_SIZE - 60) { - n += sprintf(buf + n, " nodes="); - n += nodelist_scnprintf(buf + n, PAGE_SIZE - n - 50, + len < PAGE_SIZE - 60) { + len += sprintf(buf + len, " nodes="); + len += nodelist_scnprintf(buf + len, PAGE_SIZE - len - 50, l->nodes); } - n += sprintf(buf + n, "\n"); + len += sprintf(buf + len, "\n"); } free_loc_track(&t); if (!t.count) - n += sprintf(buf, "No data\n"); - return n; + len += sprintf(buf, "No data\n"); + return len; } enum slab_stat_type { @@ -3498,7 +3498,6 @@ static unsigned long slab_objects(struct kmem_cache *s, for_each_possible_cpu(cpu) { struct page *page; - int node; struct kmem_cache_cpu *c = get_cpu_slab(s, cpu); if (!c) @@ -3510,8 +3509,6 @@ static unsigned long slab_objects(struct kmem_cache *s, continue; if (page) { if (flags & SO_CPU) { - int x = 0; - if (flags & SO_OBJECTS) x = page->inuse; else -- 1.5.4.rc4.1142.gf5a97 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-01-31 4:41 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-01-31 4:23 [PATCH] slub: fix shadowed variable sparse warnings Harvey Harrison 2008-01-31 4:28 ` Christoph Lameter 2008-01-31 4:40 ` [PATCHv2] " Harvey Harrison
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox