summaryrefslogtreecommitdiffstats
path: root/mm/migrate.c
diff options
context:
space:
mode:
authorKefeng Wang <wangkefeng.wang@huawei.com>2023-09-13 11:51:31 +0200
committerAndrew Morton <akpm@linux-foundation.org>2023-10-04 19:32:28 +0200
commitfa1df3f6287e1e1fd8b5309828238e2c728e985f (patch)
treecd02a7c4b04054491a97893d53d31030d2d38803 /mm/migrate.c
parentmm: migrate: remove PageHead() check for HugeTLB in add_page_for_migration() (diff)
downloadlinux-fa1df3f6287e1e1fd8b5309828238e2c728e985f.tar.xz
linux-fa1df3f6287e1e1fd8b5309828238e2c728e985f.zip
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>
Diffstat (limited to 'mm/migrate.c')
-rw-r--r--mm/migrate.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index 8495e7e02dd4..7d1804c4a5d9 100644
--- 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);