mm: migrate: remove isolated variable in add_page_for_migration()

Directly check the return of isolate_hugetlb() and folio_isolate_lru() to
remove isolated variable, also setup err = -EBUSY in advance before
isolation, and update err only when successfully queued for migration,
which could help us to unify and simplify code a bit.

Link: https://lkml.kernel.org/r/20230913095131.2426871-9-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/migrate.c b/mm/migrate.c
index 8495e7e..7d1804c 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2062,7 +2062,6 @@ static int add_page_for_migration(struct mm_struct *mm, const void __user *p,
        struct page *page;
        struct folio *folio;
        int err;
-       bool isolated;
 
        mmap_read_lock(mm);
        addr = (unsigned long)untagged_addr_remote(mm, p);
@@ -2095,15 +2094,13 @@ static int add_page_for_migration(struct mm_struct *mm, const void __user *p,
        if (page_mapcount(page) > 1 && !migrate_all)
                goto out_putfolio;
 
+       err = -EBUSY;
        if (folio_test_hugetlb(folio)) {
-               isolated = isolate_hugetlb(folio, pagelist);
-               err = isolated ? 1 : -EBUSY;
+               if (isolate_hugetlb(folio, pagelist))
+                       err = 1;
        } else {
-               isolated = folio_isolate_lru(folio);
-               if (!isolated) {
-                       err = -EBUSY;
+               if (!folio_isolate_lru(folio))
                        goto out_putfolio;
-               }
 
                err = 1;
                list_add_tail(&folio->lru, pagelist);