Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Jane 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: Andrew Morton <akpm@linux-foundation.org>

authored by

Kefeng Wang and committed by
Andrew Morton
3f594937 f00b295b

+2 -9
+2 -1
fs/aio.c
··· 455 455 * events from being lost. 456 456 */ 457 457 spin_lock_irqsave(&ctx->completion_lock, flags); 458 - folio_migrate_copy(dst, src); 458 + folio_copy(dst, src); 459 + folio_migrate_flags(dst, src); 459 460 BUG_ON(ctx->ring_folios[idx] != src); 460 461 ctx->ring_folios[idx] = dst; 461 462 spin_unlock_irqrestore(&ctx->completion_lock, flags);
-1
include/linux/migrate.h
··· 76 76 void migration_entry_wait_on_locked(swp_entry_t entry, spinlock_t *ptl) 77 77 __releases(ptl); 78 78 void folio_migrate_flags(struct folio *newfolio, struct folio *folio); 79 - void folio_migrate_copy(struct folio *newfolio, struct folio *folio); 80 79 int folio_migrate_mapping(struct address_space *mapping, 81 80 struct folio *newfolio, struct folio *folio, int extra_count); 82 81
-7
mm/migrate.c
··· 672 672 } 673 673 EXPORT_SYMBOL(folio_migrate_flags); 674 674 675 - void folio_migrate_copy(struct folio *newfolio, struct folio *folio) 676 - { 677 - folio_copy(newfolio, folio); 678 - folio_migrate_flags(newfolio, folio); 679 - } 680 - EXPORT_SYMBOL(folio_migrate_copy); 681 - 682 675 /************************************************************ 683 676 * Migration functions 684 677 ***********************************************************/