diff mbox series

[v3,mm-unstable] mm/memory_hotplug: cleanup return value handing in do_migrate_range()

Message ID 20230216170703.64574-1-sj@kernel.org
State New
Headers
Series [v3,mm-unstable] mm/memory_hotplug: cleanup return value handing in do_migrate_range() |

Commit Message

SeongJae Park Feb. 16, 2023, 5:07 p.m. UTC 
  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.

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>
---
Changes from v2
(https://lore.kernel.org/linux-mm/20230215230300.61125-1-sj@kernel.org/)
- Squash patches into one
- Add Acked-by from David and Reviewed-by from Baolin

Andrew, I saw you already added v2 of this patch into mm-unstable[1], but David
asked me to squash the two patches into this one.  Could you please replace
already merged patches with this one?

[1] https://lore.kernel.org/mm-commits/20230215233032.0CECAC433EF@smtp.kernel.org/

 mm/memory_hotplug.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index bcb0dc41c2f2..6df3072d11df 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1620,12 +1620,10 @@  static int scan_movable_pages(unsigned long start, unsigned long end,
 	return 0;
 }
 
-static int
-do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
+static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 {
 	unsigned long pfn;
 	struct page *page, *head;
-	int ret = 0;
 	LIST_HEAD(source);
 	static DEFINE_RATELIMIT_STATE(migrate_rs, DEFAULT_RATELIMIT_INTERVAL,
 				      DEFAULT_RATELIMIT_BURST);
@@ -1679,7 +1677,6 @@  do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 						    page_is_file_lru(page));
 
 		} else {
-			ret = -EBUSY;
 			if (__ratelimit(&migrate_rs)) {
 				pr_warn("failed to isolate pfn %lx\n", pfn);
 				dump_page(page, "isolation failed");
@@ -1693,6 +1690,7 @@  do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 			.nmask = &nmask,
 			.gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
 		};
+		int ret;
 
 		/*
 		 * 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);
 		}
 	}
-
-	return ret;
 }
 
 static int __init cmdline_parse_movable_node(char *p)