From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: <akpm@linux-foundation.org>, <linux-mm@kvack.org>
Cc: Tony Luck <tony.luck@intel.com>,
Miaohe Lin <linmiaohe@huawei.com>, <nao.horiguchi@gmail.com>,
Matthew Wilcox <willy@infradead.org>,
David Hildenbrand <david@redhat.com>,
Muchun Song <muchun.song@linux.dev>,
Benjamin LaHaise <bcrl@kvack.org>, <jglisse@redhat.com>,
Jiaqi Yan <jiaqiyan@google.com>, Hugh Dickins <hughd@google.com>,
Vishal Moola <vishal.moola@gmail.com>,
Alistair Popple <apopple@nvidia.com>,
Jane Chu <jane.chu@oracle.com>,
Oscar Salvador <osalvador@suse.de>,
Lance Yang <ioworker0@gmail.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v4 6/6] mm: migrate: remove folio_migrate_copy()
Date: Mon, 3 Jun 2024 17:24:39 +0800 [thread overview]
Message-ID: <20240603092439.3360652-7-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20240603092439.3360652-1-wangkefeng.wang@huawei.com>
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().
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
fs/aio.c | 3 ++-
include/linux/migrate.h | 1 -
mm/migrate.c | 7 -------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
index 07ff8bbdcd2a..bcee11fcb08b 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -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);
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 517f70b70620..f9d92482d117 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -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);
diff --git a/mm/migrate.c b/mm/migrate.c
index e9b52a86f539..fe6ea3fb896e 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -652,13 +652,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
***********************************************************/
--
2.27.0
next prev parent reply other threads:[~2024-06-03 10:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 9:24 [PATCH v4 0/6] mm: migrate: support poison recover from migrate folio Kefeng Wang
2024-06-03 9:24 ` [PATCH v4 1/6] mm: move memory_failure_queue() into copy_mc_[user]_highpage() Kefeng Wang
2024-06-04 19:38 ` Jane Chu
2024-06-06 2:28 ` Miaohe Lin
2024-06-03 9:24 ` [PATCH v4 2/6] mm: add folio_mc_copy() Kefeng Wang
2024-06-04 19:41 ` Jane Chu
2024-06-05 3:31 ` Andrew Morton
2024-06-05 7:15 ` Kefeng Wang
2024-06-06 2:36 ` Miaohe Lin
2024-06-03 9:24 ` [PATCH v4 3/6] mm: migrate: split folio_migrate_mapping() Kefeng Wang
2024-06-06 0:54 ` Jane Chu
2024-06-06 1:24 ` Kefeng Wang
2024-06-06 1:55 ` Matthew Wilcox
2024-06-06 2:24 ` Kefeng Wang
2024-06-06 18:28 ` Jane Chu
2024-06-03 9:24 ` [PATCH v4 4/6] mm: migrate: support poisoned recover from migrate folio Kefeng Wang
2024-06-06 21:27 ` Jane Chu
2024-06-06 22:28 ` Jane Chu
2024-06-06 22:31 ` Jane Chu
2024-06-07 4:01 ` Kefeng Wang
2024-06-07 15:59 ` Jane Chu
2024-06-03 9:24 ` [PATCH v4 5/6] fs: hugetlbfs: support poison recover from hugetlbfs_migrate_folio() Kefeng Wang
2024-06-06 23:30 ` Jane Chu
2024-06-03 9:24 ` Kefeng Wang [this message]
2024-06-06 23:46 ` [PATCH v4 6/6] mm: migrate: remove folio_migrate_copy() Jane Chu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240603092439.3360652-7-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=bcrl@kvack.org \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=ioworker0@gmail.com \
--cc=jane.chu@oracle.com \
--cc=jglisse@redhat.com \
--cc=jiaqiyan@google.com \
--cc=linmiaohe@huawei.com \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=nao.horiguchi@gmail.com \
--cc=osalvador@suse.de \
--cc=tony.luck@intel.com \
--cc=vishal.moola@gmail.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox