percpu: fix static checker warnings in pcpu_destroy_chunk

From 5021b97f4026334d2c8dfad80797dd1028cddd73 Mon Sep 17 00:00:00 2001
From: Dennis Zhou <dennisz@fb.com>
Date: Thu, 29 Jun 2017 07:11:41 -0700

Add NULL check in pcpu_destroy_chunk to correct static checker warnings.

Signed-off-by: Dennis Zhou <dennisz@fb.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/mm/percpu-km.c b/mm/percpu-km.c
index 2b79e43c626f2d53aed9f2a7bea933d7bd9efc66..eb58aa4c0997540fb3eb912ee6449d2daf7d3ab2 100644 (file)
--- a/mm/percpu-km.c
+++ b/mm/percpu-km.c
@@ -82,10 +82,13 @@ static void pcpu_destroy_chunk(struct pcpu_chunk *chunk)
 {
        const int nr_pages = pcpu_group_sizes[0] >> PAGE_SHIFT;
 
+       if (!chunk)
+               return;
+
        pcpu_stats_chunk_dealloc();
        trace_percpu_destroy_chunk(chunk->base_addr);
 
-       if (chunk && chunk->data)
+       if (chunk->data)
                __free_pages(chunk->data, order_base_2(nr_pages));
        pcpu_free_chunk(chunk);
 }

diff --git a/mm/percpu-vm.c b/mm/percpu-vm.c
index 7ad9d94bf547df571d6804257cfd0a121c585b09..15dab691ea7076c99e198506b69128049f1555ad 100644 (file)
--- a/mm/percpu-vm.c
+++ b/mm/percpu-vm.c
@@ -352,10 +352,13 @@ static struct pcpu_chunk *pcpu_create_chunk(void)
 
 static void pcpu_destroy_chunk(struct pcpu_chunk *chunk)
 {
+       if (!chunk)
+               return;
+
        pcpu_stats_chunk_dealloc();
        trace_percpu_destroy_chunk(chunk->base_addr);
 
-       if (chunk && chunk->data)
+       if (chunk->data)
                pcpu_free_vm_areas(chunk->data, pcpu_nr_groups);
        pcpu_free_chunk(chunk);
 }