slub: fix shadowed variable sparse warnings

PATCH Superseded Harvey Harrison 2 participants 3 messages Jan 31, 2008

Subsystems (2)

Memory management Slab allocator

lore

Share & tools

lore

Harvey Harrison

author

2008-01-31 04:23 UTC #0 lore raw

PATCH 1/1 slub: fix shadowed variable sparse warnings

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 <[email protected]>

---
 mm/slub.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

mm/slub.c +6 -9

index 5cc4b7d..f9a20bf 100644
@@ -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

Signature · 1 line

1.5.4.rc4.1142.gf5a97

Christoph Lameter

2008-01-31 04:28 UTC #1 lore raw

Quoted 23 lines · Harvey Harrison

Signed-off-by Harvey Harrison <[email protected]>

---
 mm/slub.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

mm/slub.c +2 -3

index 5cc4b7d..f9a20bf 100644
@@ -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);

mm/slub.c static int list_locations(struct kmem_cache *s, char *buf, · line 3419

Quoted 10 lines

mm/slub.c +4 -3

-		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.

mm/slub.c static unsigned long slab_objects(struct kmem_cache *s, · line 3503

Quoted 9 lines

mm/slub.c +0 -1

 	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.

mm/slub.c static unsigned long slab_objects(struct kmem_cache *s, · line 3514

Quoted 9 lines

mm/slub.c +0 -2

@@ -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.

Harvey Harrison

author

2008-01-31 04:41 UTC #2 lore raw

PATCH v2 1/1 slub: fix shadowed variable sparse warnings

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 <[email protected]>

---
 mm/slub.c |   39 ++++++++++++++++++---------------------
 1 files changed, 18 insertions(+), 21 deletions(-)

mm/slub.c +18 ~~-21~~

index 5cc4b7d..93f5c28 100644
@@ -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

Signature · 1 line

1.5.4.rc4.1142.gf5a97