Skip to content

Commit

Permalink
mm/migration: remove some duplicated codes in migrate_pages
Browse files Browse the repository at this point in the history
Remove the duplicated codes in migrate_pages to simplify the code.  Minor
readability improvement.  No functional change intended.

Link: https://lkml.kernel.org/r/20220318111709.60311-9-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Miaohe Lin authored and akpm committed Apr 29, 2022
1 parent 91925ab commit f430893
Showing 1 changed file with 12 additions and 24 deletions.
36 changes: 12 additions & 24 deletions mm/migrate.c
Original file line number Diff line number Diff line change
Expand Up @@ -1410,14 +1410,11 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
nr_thp_split++;
goto retry;
}

nr_failed_pages += nr_subpages;
break;
}

/* Hugetlb migration is unsupported */
if (!no_subpage_counting)
} else if (!no_subpage_counting) {
nr_failed++;
}

nr_failed_pages += nr_subpages;
break;
case -ENOMEM:
Expand All @@ -1432,28 +1429,22 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
nr_thp_split++;
goto retry;
}

nr_failed_pages += nr_subpages;
goto out;
} else if (!no_subpage_counting) {
nr_failed++;
}

if (!no_subpage_counting)
nr_failed++;
nr_failed_pages += nr_subpages;
goto out;
case -EAGAIN:
if (is_thp) {
if (is_thp)
thp_retry++;
break;
}
retry++;
else
retry++;
break;
case MIGRATEPAGE_SUCCESS:
nr_succeeded += nr_subpages;
if (is_thp) {
if (is_thp)
nr_thp_succeeded++;
break;
}
break;
default:
/*
Expand All @@ -1462,14 +1453,11 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
* removed from migration page list and not
* retried in the next outer loop.
*/
if (is_thp) {
if (is_thp)
nr_thp_failed++;
nr_failed_pages += nr_subpages;
break;
}

if (!no_subpage_counting)
else if (!no_subpage_counting)
nr_failed++;

nr_failed_pages += nr_subpages;
break;
}
Expand Down

0 comments on commit f430893

Please sign in to comment.