Commit 3f594937 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: migrate: remove folio_migrate_copy() 

The folio_migrate_copy() is just a wrapper of folio_copy() and
folio_migrate_flags(), it is simple and only aio use it for now, unfold it
and remove folio_migrate_copy().

Link: https://lkml.kernel.org/r/20240626085328.608006-7-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: Lance Yang <ioworker0@gmail.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: Oscar Salvador <osalvador@suse.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f00b295b

fs/aio.c

+2 −1
Original line number Diff line number Diff line
@@ -455,7 +455,8 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst, 
	 * events from being lost.

	 */

	spin_lock_irqsave(&ctx->completion_lock, flags);

	folio_migrate_copy(dst, src);

	folio_copy(dst, src);

	folio_migrate_flags(dst, src);

	BUG_ON(ctx->ring_folios[idx] != src);

	ctx->ring_folios[idx] = dst;

	spin_unlock_irqrestore(&ctx->completion_lock, flags);

include/linux/migrate.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ int migrate_huge_page_move_mapping(struct address_space *mapping, 
void migration_entry_wait_on_locked(swp_entry_t entry, spinlock_t *ptl)

		__releases(ptl);

void folio_migrate_flags(struct folio *newfolio, struct folio *folio);

void folio_migrate_copy(struct folio *newfolio, struct folio *folio);

int folio_migrate_mapping(struct address_space *mapping,

		struct folio *newfolio, struct folio *folio, int extra_count);

mm/migrate.c

+0 −7
Original line number Diff line number Diff line
@@ -672,13 +672,6 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) 
}

EXPORT_SYMBOL(folio_migrate_flags);



void folio_migrate_copy(struct folio *newfolio, struct folio *folio)

{

	folio_copy(newfolio, folio);

	folio_migrate_flags(newfolio, folio);

}

EXPORT_SYMBOL(folio_migrate_copy);



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

 *                    Migration functions

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