Add else to split mutually exclusive case and avoid some unnecessary check.

Signed-off-by: Miaohe Lin <linmia...@huawei.com>
---
 mm/mempool.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mm/mempool.c b/mm/mempool.c
index 79bff63ecf27..73fb2e548b43 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -60,9 +60,8 @@ static void check_element(mempool_t *pool, void *element)
        /* Mempools backed by slab allocator */
        if (pool->free == mempool_free_slab || pool->free == mempool_kfree)
                __check_element(pool, element, ksize(element));
-
        /* Mempools backed by page allocator */
-       if (pool->free == mempool_free_pages) {
+       else if (pool->free == mempool_free_pages) {
                int order = (int)(long)pool->pool_data;
                void *addr = kmap_atomic((struct page *)element);
 
@@ -84,9 +83,8 @@ static void poison_element(mempool_t *pool, void *element)
        /* Mempools backed by slab allocator */
        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
                __poison_element(element, ksize(element));
-
        /* Mempools backed by page allocator */
-       if (pool->alloc == mempool_alloc_pages) {
+       else if (pool->alloc == mempool_alloc_pages) {
                int order = (int)(long)pool->pool_data;
                void *addr = kmap_atomic((struct page *)element);
 
@@ -107,7 +105,7 @@ static __always_inline void kasan_poison_element(mempool_t 
*pool, void *element)
 {
        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
                kasan_poison_kfree(element, _RET_IP_);
-       if (pool->alloc == mempool_alloc_pages)
+       else if (pool->alloc == mempool_alloc_pages)
                kasan_free_pages(element, (unsigned long)pool->pool_data);
 }
 
@@ -115,7 +113,7 @@ static void kasan_unpoison_element(mempool_t *pool, void 
*element)
 {
        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
                kasan_unpoison_slab(element);
-       if (pool->alloc == mempool_alloc_pages)
+       else if (pool->alloc == mempool_alloc_pages)
                kasan_alloc_pages(element, (unsigned long)pool->pool_data);
 }
 
-- 
2.19.1

Reply via email to