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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC3D9C43334 for ; Thu, 23 Jun 2022 06:46:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 892408E0130; Thu, 23 Jun 2022 02:46:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 842698E0115; Thu, 23 Jun 2022 02:46:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 732408E0130; Thu, 23 Jun 2022 02:46:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 62FFA8E0115 for ; Thu, 23 Jun 2022 02:46:18 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 239E060B20 for ; Thu, 23 Jun 2022 06:46:18 +0000 (UTC) X-FDA: 79608566436.24.4CFDC14 Received: from mail.nfschina.com (unknown [124.16.136.209]) by imf28.hostedemail.com (Postfix) with ESMTP id A56F2C0028 for ; Thu, 23 Jun 2022 06:46:16 +0000 (UTC) Received: from localhost (unknown [127.0.0.1]) by mail.nfschina.com (Postfix) with ESMTP id 5E12C1E80C85; Thu, 23 Jun 2022 14:45:56 +0800 (CST) X-Virus-Scanned: amavisd-new at test.com Received: from mail.nfschina.com ([127.0.0.1]) by localhost (mail.nfschina.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B06JfwXUQAjO; Thu, 23 Jun 2022 14:45:53 +0800 (CST) Received: from localhost.localdomain.localdomain (unknown [219.141.250.2]) (Authenticated sender: lvqian@nfschina.com) by mail.nfschina.com (Postfix) with ESMTPA id 9A95E1E80C7D; Thu, 23 Jun 2022 14:45:53 +0800 (CST) From: Lv qian To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel@nfschina.com, Lv qian Subject: [PATCH] vmalloc:Merge multiple if conditional sentences Date: Thu, 23 Jun 2022 14:45:27 +0800 Message-Id: <20220623064527.4238-1-lvqian@nfschina.com> X-Mailer: git-send-email 2.18.2 ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=none (imf28.hostedemail.com: domain of lvqian@nfschina.com has no SPF policy when checking 124.16.136.209) smtp.mailfrom=lvqian@nfschina.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655966777; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=5w0qljzJUVw6IvaA/XOn4iL8yIHgX5eaIJ/2iY95iTs=; b=CEj+j8qjqY1L0RJip4H6krhz/PNDJHZ5ndRuXhnxtRrb9ymUNLM1NyVAqOTdC+UMXydoU2 WAaZEpRzHkUrZrOFGfwXm6fyrtr6+FAg3WITM8yDih5KbiyKXuOykH5lOrSVU9/VbiBYyg N2qzbk4dP0sxTQDnXH9JaW1pYgRQYP8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655966777; a=rsa-sha256; cv=none; b=QzusxmbdL3XEI4a6Nf+bExTrDn8du8am/7/qcmR9remxp6Kc57aGA2/Pcxx4HynQ2jybJM nsFq3wzvxvlIqmEsFNwupHjK/QGwGNLPu5JUm0i25GgaEW57aagytV+6zssVM5FQ2ops/E D7RvWCQNE/gFfKjN/D36x569hpSsuGU= X-Stat-Signature: m3ja17in3ocnwkccz4r1mzud6nym71j1 X-Rspam-User: X-Rspamd-Server: rspam07 Authentication-Results: imf28.hostedemail.com; dkim=none; spf=none (imf28.hostedemail.com: domain of lvqian@nfschina.com has no SPF policy when checking 124.16.136.209) smtp.mailfrom=lvqian@nfschina.com; dmarc=none X-Rspamd-Queue-Id: A56F2C0028 X-HE-Tag: 1655966776-428156 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: Merge multiple if statements to improve code readability Signed-off-by: Lv qian --- mm/vmalloc.c | 66 ++++++++++++++-------------------------------------- 1 file changed, 18 insertions(+), 48 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index effd1ff6a4b4..6902a180f8f7 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -135,22 +135,12 @@ static int vmap_try_huge_pmd(pmd_t *pmd, unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot, unsigned int max_page_shift) { - if (max_page_shift < PMD_SHIFT) - return 0; - - if (!arch_vmap_pmd_supported(prot)) - return 0; - - if ((end - addr) != PMD_SIZE) - return 0; - - if (!IS_ALIGNED(addr, PMD_SIZE)) - return 0; - - if (!IS_ALIGNED(phys_addr, PMD_SIZE)) - return 0; - - if (pmd_present(*pmd) && !pmd_free_pte_page(pmd, addr)) + if (max_page_shift < PMD_SHIFT || + !arch_vmap_pmd_supported(prot) || + (end - addr) != PMD_SIZE || + !IS_ALIGNED(addr, PMD_SIZE) || + !IS_ALIGNED(phys_addr, PMD_SIZE) || + (pmd_present(*pmd) && !pmd_free_pte_page(pmd, addr))) return 0; return pmd_set_huge(pmd, phys_addr, prot); @@ -185,22 +175,12 @@ static int vmap_try_huge_pud(pud_t *pud, unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot, unsigned int max_page_shift) { - if (max_page_shift < PUD_SHIFT) - return 0; - - if (!arch_vmap_pud_supported(prot)) - return 0; - - if ((end - addr) != PUD_SIZE) - return 0; - - if (!IS_ALIGNED(addr, PUD_SIZE)) - return 0; - - if (!IS_ALIGNED(phys_addr, PUD_SIZE)) - return 0; - - if (pud_present(*pud) && !pud_free_pmd_page(pud, addr)) + if (max_page_shift < PUD_SHIFT || + !arch_vmap_pud_supported(prot) || + (end - addr) != PUD_SIZE || + !IS_ALIGNED(addr, PUD_SIZE) || + !IS_ALIGNED(phys_addr, PUD_SIZE) || + (pud_present(*pud) && !pud_free_pmd_page(pud, addr))) return 0; return pud_set_huge(pud, phys_addr, prot); @@ -236,22 +216,12 @@ static int vmap_try_huge_p4d(p4d_t *p4d, unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot, unsigned int max_page_shift) { - if (max_page_shift < P4D_SHIFT) - return 0; - - if (!arch_vmap_p4d_supported(prot)) - return 0; - - if ((end - addr) != P4D_SIZE) - return 0; - - if (!IS_ALIGNED(addr, P4D_SIZE)) - return 0; - - if (!IS_ALIGNED(phys_addr, P4D_SIZE)) - return 0; - - if (p4d_present(*p4d) && !p4d_free_pud_page(p4d, addr)) + if (max_page_shift < P4D_SHIFT || + !arch_vmap_p4d_supported(prot) || + (end - addr) != P4D_SIZE || + !IS_ALIGNED(addr, P4D_SIZE) || + !IS_ALIGNED(phys_addr, P4D_SIZE) || + (p4d_present(*p4d) && !p4d_free_pud_page(p4d, addr))) return 0; return p4d_set_huge(p4d, phys_addr, prot); -- 2.18.2