The patch titled
Subject: slab-use-get_node-and-kmem_cache_node-functions-fix
has been removed from the -mm tree. Its filename was
slab-use-get_node-and-kmem_cache_node-functions-fix.patch
This patch was dropped because it was folded into slab-use-get_node-and-kmem_cache_node-functions.patch
------------------------------------------------------
From: Christoph Lameter <cl@xxxxxxxxxx>
Subject: slab-use-get_node-and-kmem_cache_node-functions-fix
On Thu, 12 Jun 2014, Joonsoo Kim wrote:
> > @@ -3759,8 +3746,8 @@ fail:
> > /* Cache is not active yet. Roll back what we did */
> > node--;
> > while (node >= 0) {
> > - if (cachep->node[node]) {
> > - n = cachep->node[node];
> > + if (get_node(cachep, node)) {
> > + n = get_node(cachep, node);
>
> Could you do this as following?
>
> n = get_node(cachep, node);
> if (n) {
> ...
> }
Sure....
Subject: slab: Fixes to earlier patch
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slab.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff -puN mm/slab.c~slab-use-get_node-and-kmem_cache_node-functions-fix mm/slab.c
--- a/mm/slab.c~slab-use-get_node-and-kmem_cache_node-functions-fix
+++ a/mm/slab.c
@@ -561,8 +561,8 @@ static inline void on_slab_lock_classes(
struct kmem_cache_node *n;
VM_BUG_ON(OFF_SLAB(cachep));
- for_each_kmem_cache_node(cachep, node, h)
- on_slab_lock_classes_node(cachep, h);
+ for_each_kmem_cache_node(cachep, node, n)
+ on_slab_lock_classes_node(cachep, n);
}
static inline void __init init_lock_keys(void)
@@ -586,7 +586,7 @@ static inline void on_slab_lock_classes(
}
static inline void on_slab_lock_classes_node(struct kmem_cache *cachep,
- int node, struct kmem_cache_node *n)
+ struct kmem_cache_node *n)
{
}
@@ -823,7 +823,7 @@ static inline bool is_slab_pfmemalloc(st
static void recheck_pfmemalloc_active(struct kmem_cache *cachep,
struct array_cache *ac)
{
- struct kmem_cache_node *n = get_node(cachep,numa_mem_id());
+ struct kmem_cache_node *n = get_node(cachep, numa_mem_id());
struct page *page;
unsigned long flags;
@@ -1308,7 +1308,7 @@ static int cpuup_prepare(long cpu)
slab_set_debugobj_lock_classes_node(cachep, node);
else if (!OFF_SLAB(cachep) &&
!(cachep->flags & SLAB_DESTROY_BY_RCU))
- on_slab_lock_classes_node(cachep, node, n);
+ on_slab_lock_classes_node(cachep, n);
}
init_node_lock_keys(node);
@@ -3807,9 +3807,8 @@ fail:
/* Cache is not active yet. Roll back what we did */
node--;
while (node >= 0) {
- if (get_node(cachep, node)) {
- n = get_node(cachep, node);
-
+ n = get_node(cachep, node);
+ if (n) {
kfree(n->shared);
free_alien_cache(n->alien);
kfree(n);
_
Patches currently in -mm which might be from cl@xxxxxxxxxx are
origin.patch
slab-use-get_node-and-kmem_cache_node-functions.patch
slab-use-get_node-and-kmem_cache_node-functions-fix-2.patch
kernel-smpc-on_each_cpu_cond-fix-warning-in-fallback-path.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
