Commit 28d950d0 authored by Kefeng Wang's avatar Kefeng Wang Committed by Tong Tiangen
Browse files

mm: migrate: remove migrate_folio_extra() 

mainline inclusion
from mainline-v6.11-rc1
commit 940d6683c79950b21b3762124eabfa9b2f6fee96
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAROKE
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=940d6683c79950b21b3762124eabfa9b2f6fee96

--------------------------------

migrate_folio_extra() is only called in migrate.c now, convert it a static
function and take a new src_private argument which could be shared by
migrate_folio() and filemap_migrate_folio() to simplify code a bit.

Link: https://lkml.kernel.org/r/20240524052843.182275-5-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarJane Chu <jane.chu@oracle.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Jiaqi Yan <jiaqiyan@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
parent e8aa0fd6

include/linux/migrate.h

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ extern const char *migrate_reason_names[MR_TYPES]; 
#ifdef CONFIG_MIGRATION



void putback_movable_pages(struct list_head *l);

int migrate_folio_extra(struct address_space *mapping, struct folio *dst,

		struct folio *src, enum migrate_mode mode, int extra_count);

int migrate_folio(struct address_space *mapping, struct folio *dst,

		struct folio *src, enum migrate_mode mode);

int migrate_pages(struct list_head *l, new_folio_t new, free_folio_t free,

mm/migrate.c

+11 −22
Original line number Diff line number Diff line
@@ -673,18 +673,19 @@ EXPORT_SYMBOL(folio_migrate_copy); 
 *                    Migration functions

 ***********************************************************/



int migrate_folio_extra(struct address_space *mapping, struct folio *dst,

		struct folio *src, enum migrate_mode mode, int extra_count)

static int __migrate_folio(struct address_space *mapping, struct folio *dst,

			   struct folio *src, void *src_private,

			   enum migrate_mode mode)

{

	int rc;



	BUG_ON(folio_test_writeback(src));	/* Writeback must be complete */



	rc = folio_migrate_mapping(mapping, dst, src, extra_count);



	rc = folio_migrate_mapping(mapping, dst, src, 0);

	if (rc != MIGRATEPAGE_SUCCESS)

		return rc;



	if (src_private)

		folio_attach_private(dst, folio_detach_private(src));



	if (mode != MIGRATE_SYNC_NO_COPY)

		folio_migrate_copy(dst, src);

	else
@@ -707,7 +708,8 @@ int migrate_folio_extra(struct address_space *mapping, struct folio *dst, 
int migrate_folio(struct address_space *mapping, struct folio *dst,

		  struct folio *src, enum migrate_mode mode)

{

	return migrate_folio_extra(mapping, dst, src, mode, 0);

	BUG_ON(folio_test_writeback(src));	/* Writeback must be complete */

	return __migrate_folio(mapping, dst, src, NULL, mode);

}

EXPORT_SYMBOL(migrate_folio);
@@ -861,20 +863,7 @@ EXPORT_SYMBOL_GPL(buffer_migrate_folio_norefs); 
int filemap_migrate_folio(struct address_space *mapping,

		struct folio *dst, struct folio *src, enum migrate_mode mode)

{

	int ret;



	ret = folio_migrate_mapping(mapping, dst, src, 0);

	if (ret != MIGRATEPAGE_SUCCESS)

		return ret;



	if (folio_get_private(src))

		folio_attach_private(dst, folio_detach_private(src));



	if (mode != MIGRATE_SYNC_NO_COPY)

		folio_migrate_copy(dst, src);

	else

		folio_migrate_flags(dst, src);

	return MIGRATEPAGE_SUCCESS;

	return __migrate_folio(mapping, dst, src, folio_get_private(src), mode);

}

EXPORT_SYMBOL_GPL(filemap_migrate_folio);