mm/page_isolation: simplify return value of start_isolate_page_range() (3fa0c7c7) · Commits · 戴 / test

mm/memory_hotplug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1514,7 +1514,7 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages)
		ret = start_isolate_page_range(start_pfn, end_pfn,
		MIGRATE_MOVABLE,
		MEMORY_OFFLINE \| REPORT_FAILURE);
		if (ret < 0) {
		if (ret) {
		reason = "failure to isolate range";
		goto failed_removal;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -8468,7 +8468,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,

		ret = start_isolate_page_range(pfn_max_align_down(start),
		pfn_max_align_up(end), migratetype, 0);
		if (ret < 0)
		if (ret)
		return ret;

		/*

+2 −5

Original line number	Diff line number	Diff line
		@@ -173,8 +173,7 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages)
		* (e.g. __offline_pages will need to call it after check for isolated range for
		* a next retry).
		*
		* Return: the number of isolated pageblocks on success and -EBUSY if any part
		* of range cannot be isolated.
		* Return: 0 on success and -EBUSY if any part of range cannot be isolated.
		*/
		int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
		unsigned migratetype, int flags)
		@@ -182,7 +181,6 @@ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
		unsigned long pfn;
		unsigned long undo_pfn;
		struct page *page;
		int nr_isolate_pageblock = 0;

		BUG_ON(!IS_ALIGNED(start_pfn, pageblock_nr_pages));
		BUG_ON(!IS_ALIGNED(end_pfn, pageblock_nr_pages));
		@@ -196,10 +194,9 @@ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
		undo_pfn = pfn;
		goto undo;
		}
		nr_isolate_pageblock++;
		}
		}
		return nr_isolate_pageblock;
		return 0;
		undo:
		for (pfn = start_pfn;
		pfn < undo_pfn;