summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi RongQing <lirongqing@baidu.com>2019-05-13 20:16:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-14 12:47:45 -0400
commit517f9f1ee5ed0a05d0f6f884f6d9b5c46ac5a810 (patch)
tree4d697c043807115551b7598f81898b83be97f354
parenta4d3f8916c65b63e6b9457cdec74ceaaff7e6b12 (diff)
mm/slab.c: remove unneed check in cpuup_canceled
nc is a member of percpu allocation memory, and cannot be NULL. Link: http://lkml.kernel.org/r/1553159353-5056-1-git-send-email-lirongqing@baidu.com Signed-off-by: Li RongQing <lirongqing@baidu.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/slab.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c
index e9eaa8fce231..da4068a95307 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -990,10 +990,8 @@ static void cpuup_canceled(long cpu)
990 990
991 /* cpu is dead; no one can alloc from it. */ 991 /* cpu is dead; no one can alloc from it. */
992 nc = per_cpu_ptr(cachep->cpu_cache, cpu); 992 nc = per_cpu_ptr(cachep->cpu_cache, cpu);
993 if (nc) { 993 free_block(cachep, nc->entry, nc->avail, node, &list);
994 free_block(cachep, nc->entry, nc->avail, node, &list); 994 nc->avail = 0;
995 nc->avail = 0;
996 }
997 995
998 if (!cpumask_empty(mask)) { 996 if (!cpumask_empty(mask)) {
999 spin_unlock_irq(&n->list_lock); 997 spin_unlock_irq(&n->list_lock);