iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm/memory_hotplug: cleanup return value handing in do_migrate_range()

Browse Source 
Return value mechanism of do_migrate_range() is not very simple, while no
caller of the function checks the return value.  Make the function return
nothing to be more simple, and cleanup related unnecessary code.

Link: https://lkml.kernel.org/r/20230216170703.64574-1-sj@kernel.org
Suggested-by: David Hildenbrand <david@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: SeongJae Park <sj@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
SeongJae Park 2023-02-16 17:07:03 +00:00 committed by Andrew Morton
parent 7a079ba200
commit 32cf666eab
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/memory_hotplug.c
View File

@ -1620,12 +1620,10 @@ found:
return 0; return 0;
} }
static int static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
{ {
unsigned long pfn; unsigned long pfn;
struct page *page, *head; struct page *page, *head;
int ret = 0;
LIST_HEAD(source); LIST_HEAD(source);
static DEFINE_RATELIMIT_STATE(migrate_rs, DEFAULT_RATELIMIT_INTERVAL, static DEFINE_RATELIMIT_STATE(migrate_rs, DEFAULT_RATELIMIT_INTERVAL,
DEFAULT_RATELIMIT_BURST); DEFAULT_RATELIMIT_BURST);
@ -1679,7 +1677,6 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
page_is_file_lru(page)); page_is_file_lru(page));
} else { } else {
ret = -EBUSY;
if (__ratelimit(&migrate_rs)) { if (__ratelimit(&migrate_rs)) {
pr_warn("failed to isolate pfn %lx\n", pfn); pr_warn("failed to isolate pfn %lx\n", pfn);
dump_page(page, "isolation failed"); dump_page(page, "isolation failed");
@ -1693,6 +1690,7 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
.nmask = &nmask, .nmask = &nmask,
.gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
}; };
int ret;
/* /*
* We have checked that migration range is on a single zone so * We have checked that migration range is on a single zone so
@ -1721,8 +1719,6 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
putback_movable_pages(&source); putback_movable_pages(&source);
} }
} }
return ret;
} }
static int __init cmdline_parse_movable_node(char *p) static int __init cmdline_parse_movable_node(char *p)