mm/memory-failure: remove a wrapper for alloc_migration_target() (54608759) · Commits · 戴 / test

mm/memory-failure.c

+6 −12

Original line number	Diff line number	Diff line
		@@ -1673,16 +1673,6 @@ int unpoison_memory(unsigned long pfn)
		}
		EXPORT_SYMBOL(unpoison_memory);

		static struct page new_page(struct page p, unsigned long private)
		{
		struct migration_target_control mtc = {
		.nid = page_to_nid(p),
		.gfp_mask = GFP_USER \| __GFP_MOVABLE \| __GFP_RETRY_MAYFAIL,
		};

		return alloc_migration_target(p, (unsigned long)&mtc);
		}

		/*
		* Safely get reference count of an arbitrary page.
		* Returns 0 for a free page, -EIO for a zero refcount page
		@@ -1797,6 +1787,10 @@ static int __soft_offline_page(struct page *page)
		char const *msg_page[] = {"page", "hugepage"};
		bool huge = PageHuge(page);
		LIST_HEAD(pagelist);
		struct migration_target_control mtc = {
		.nid = NUMA_NO_NODE,
		.gfp_mask = GFP_USER \| __GFP_MOVABLE \| __GFP_RETRY_MAYFAIL,
		};

		/*
		* Check PageHWPoison again inside page lock because PageHWPoison
		@@ -1833,8 +1827,8 @@ static int __soft_offline_page(struct page *page)
		}

		if (isolate_page(hpage, &pagelist)) {
		ret = migrate_pages(&pagelist, new_page, NULL, MPOL_MF_MOVE_ALL,
		MIGRATE_SYNC, MR_MEMORY_FAILURE);
		ret = migrate_pages(&pagelist, alloc_migration_target, NULL,
		(unsigned long)&mtc, MIGRATE_SYNC, MR_MEMORY_FAILURE);
		if (!ret) {
		bool release = !huge;