Skip to contentSkip to conversation

slab: nodelist is now just node

PATCH New Paul Gortmaker 1 participant 1 message Oct 8, 2013 Memory management

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 slab: nodelist is now just node

The rt patch "mm-slab-more-lock-breaks.patch" adds some operations looking for nodelist, but mainline commit 6a67368c36e2c0c2578ba62f ("slab: Rename nodelists to node") means that the old naming is out of date and breaks compiles, even for !RT_FULL

---

[Should be squished into mm-slab-wrap-functions.patch]

 mm/slab.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
mm/slab.c +3 -3
index b242b50..7349569 100644
@@ -1239,11 +1239,11 @@ static int init_cache_node_node(int node)
 			cachep->node[node] = n;
 		}
 
-		local_spin_lock_irq(slab_lock, &cachep->nodelists[node]->list_lock);
+		local_spin_lock_irq(slab_lock, &cachep->node[node]->list_lock);
 		cachep->node[node]->free_limit =
 			(1 + nr_cpus_node(node)) *
 			cachep->batchcount + cachep->num;
-		local_spin_unlock_irq(slab_lock, &cachep->nodelists[node]->list_lock);
+		local_spin_unlock_irq(slab_lock, &cachep->node[node]->list_lock);
 	}
 	return 0;
 }
@@ -4064,7 +4064,7 @@ static int __do_tune_cpucache(struct kmem_cache *cachep, int limit,
 				    &cachep->node[cpu_to_mem(i)]->list_lock);
 		free_block(cachep, ccold->entry, ccold->avail, cpu_to_mem(i));
 
-		unlock_l3_and_free_delayed(&cachep->nodelists[cpu_to_mem(i)]->list_lock);
+		unlock_l3_and_free_delayed(&cachep->node[cpu_to_mem(i)]->list_lock);
 		kfree(ccold);
 	}
 	kfree(new);
Signature · 1 line
1.8.1.2