From: Lv qian <lvqian@nfschina.com>
To: akpm@linux-foundation.org
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
kernel@nfschina.com, Lv qian <lvqian@nfschina.com>
Subject: [PATCH] vmalloc:Merge multiple if conditional sentences
Date: Thu, 23 Jun 2022 14:45:27 +0800 [thread overview]
Message-ID: <20220623064527.4238-1-lvqian@nfschina.com> (raw)
Merge multiple if statements to improve code readability
Signed-off-by: Lv qian <lvqian@nfschina.com>
---
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
next reply other threads:[~2022-06-23 6:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 6:45 Lv qian [this message]
2022-06-23 7:34 ` Muchun Song
2022-06-23 8:12 ` Christophe Leroy
2022-06-23 18:39 ` Uladzislau Rezki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220623064527.4238-1-lvqian@nfschina.com \
--to=lvqian@nfschina.com \
--cc=akpm@linux-foundation.org \
--cc=kernel@nfschina.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox