From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 812A2C433E1 for ; Mon, 24 Aug 2020 11:55:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4CCED206BE for ; Mon, 24 Aug 2020 11:55:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CCED206BE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C9CFA6B0008; Mon, 24 Aug 2020 07:55:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C24B08D0001; Mon, 24 Aug 2020 07:55:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEC866B000C; Mon, 24 Aug 2020 07:55:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0034.hostedemail.com [216.40.44.34]) by kanga.kvack.org (Postfix) with ESMTP id 9647F6B0008 for ; Mon, 24 Aug 2020 07:55:19 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 586CE1EE6 for ; Mon, 24 Aug 2020 11:55:19 +0000 (UTC) X-FDA: 77185306758.09.lip01_5f1304727053 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 36F75180AD81F for ; Mon, 24 Aug 2020 11:55:19 +0000 (UTC) X-HE-Tag: lip01_5f1304727053 X-Filterd-Recvd-Size: 3099 Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Aug 2020 11:55:18 +0000 (UTC) Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 259FA63D7B06DC90E64A; Mon, 24 Aug 2020 19:55:08 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Mon, 24 Aug 2020 19:55:02 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH] mm/mempool: Add 'else' to split mutually exclusive case Date: Mon, 24 Aug 2020 07:53:54 -0400 Message-ID: <20200824115354.7879-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 36F75180AD81F X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add else to split mutually exclusive case and avoid some unnecessary chec= k. Signed-off-by: Miaohe Lin --- 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 *elemen= t) /* Mempools backed by slab allocator */ if (pool->free =3D=3D mempool_free_slab || pool->free =3D=3D mempool_kf= ree) __check_element(pool, element, ksize(element)); - /* Mempools backed by page allocator */ - if (pool->free =3D=3D mempool_free_pages) { + else if (pool->free =3D=3D mempool_free_pages) { int order =3D (int)(long)pool->pool_data; void *addr =3D kmap_atomic((struct page *)element); =20 @@ -84,9 +83,8 @@ static void poison_element(mempool_t *pool, void *eleme= nt) /* Mempools backed by slab allocator */ if (pool->alloc =3D=3D mempool_alloc_slab || pool->alloc =3D=3D mempool= _kmalloc) __poison_element(element, ksize(element)); - /* Mempools backed by page allocator */ - if (pool->alloc =3D=3D mempool_alloc_pages) { + else if (pool->alloc =3D=3D mempool_alloc_pages) { int order =3D (int)(long)pool->pool_data; void *addr =3D kmap_atomic((struct page *)element); =20 @@ -107,7 +105,7 @@ static __always_inline void kasan_poison_element(memp= ool_t *pool, void *element) { if (pool->alloc =3D=3D mempool_alloc_slab || pool->alloc =3D=3D mempool= _kmalloc) kasan_poison_kfree(element, _RET_IP_); - if (pool->alloc =3D=3D mempool_alloc_pages) + else if (pool->alloc =3D=3D mempool_alloc_pages) kasan_free_pages(element, (unsigned long)pool->pool_data); } =20 @@ -115,7 +113,7 @@ static void kasan_unpoison_element(mempool_t *pool, v= oid *element) { if (pool->alloc =3D=3D mempool_alloc_slab || pool->alloc =3D=3D mempool= _kmalloc) kasan_unpoison_slab(element); - if (pool->alloc =3D=3D mempool_alloc_pages) + else if (pool->alloc =3D=3D mempool_alloc_pages) kasan_alloc_pages(element, (unsigned long)pool->pool_data); } =20 --=20 2.19.1