]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mm/huge_memory: use helper macro IS_ERR_OR_NULL in split_huge_pages_pid
authorMiaohe Lin <linmiaohe@huawei.com>
Mon, 4 Jul 2022 13:22:01 +0000 (21:22 +0800)
committerakpm <akpm@linux-foundation.org>
Mon, 18 Jul 2022 00:14:47 +0000 (17:14 -0700)
Use helper macro IS_ERR_OR_NULL to check the validity of page to simplify
the code. Minor readability improvement.

Link: https://lkml.kernel.org/r/20220704132201.14611-17-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Zach O'Keefe <zokeefe@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/huge_memory.c

index 17e392ec9eb3ba3aa2471a792c1595c3c6c7e3cd..814020689d3e882befa639f2836104115b5430a8 100644 (file)
@@ -2958,9 +2958,7 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start,
                /* FOLL_DUMP to ignore special (like zero) pages */
                page = follow_page(vma, addr, FOLL_GET | FOLL_DUMP);
 
-               if (IS_ERR(page))
-                       continue;
-               if (!page || is_zone_device_page(page))
+               if (IS_ERR_OR_NULL(page) || is_zone_device_page(page))
                        continue;
 
                if (!is_transparent_hugepage(page))