From: "Matthew Wilcox \(Oracle\) via Ocfs2-devel" <ocfs2-devel@oss.oracle.com>
To: linux-fsdevel@vger.kernel.org
Cc: linux-aio@kvack.org, linux-nfs@vger.kernel.org,
cluster-devel@redhat.com, linux-ntfs-dev@lists.sourceforge.net,
linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-block@vger.kernel.org, linux-mm@kvack.org,
linux-mtd@lists.infradead.org, ocfs2-devel@oss.oracle.com,
linux-ext4@vger.kernel.org,
virtualization@lists.linux-foundation.org,
linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org
Subject: [Ocfs2-devel] [PATCH v2 18/19] fs: Remove aops->migratepage()
Date: Wed, 8 Jun 2022 16:02:48 +0100 [thread overview]
Message-ID: <20220608150249.3033815-19-willy@infradead.org> (raw)
In-Reply-To: <20220608150249.3033815-1-willy@infradead.org>
With all users converted to migrate_folio(), remove this operation.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
include/linux/fs.h | 2 --
mm/compaction.c | 5 ++---
mm/migrate.c | 3 ---
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9e6b17da4e11..7e06919b8f60 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -367,8 +367,6 @@ struct address_space_operations {
*/
int (*migrate_folio)(struct address_space *, struct folio *dst,
struct folio *src, enum migrate_mode);
- int (*migratepage) (struct address_space *,
- struct page *, struct page *, enum migrate_mode);
int (*launder_folio)(struct folio *);
bool (*is_partially_uptodate) (struct folio *, size_t from,
size_t count);
diff --git a/mm/compaction.c b/mm/compaction.c
index 458f49f9ab09..a2c53fcf933e 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1031,7 +1031,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
/*
* Only pages without mappings or that have a
- * ->migratepage callback are possible to migrate
+ * ->migrate_folio callback are possible to migrate
* without blocking. However, we can be racing with
* truncation so it's necessary to lock the page
* to stabilise the mapping as truncation holds
@@ -1043,8 +1043,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
mapping = page_mapping(page);
migrate_dirty = !mapping ||
- mapping->a_ops->migrate_folio ||
- mapping->a_ops->migratepage;
+ mapping->a_ops->migrate_folio;
unlock_page(page);
if (!migrate_dirty)
goto isolate_fail_put;
diff --git a/mm/migrate.c b/mm/migrate.c
index bed0de86f3ae..767e41800d15 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -909,9 +909,6 @@ static int move_to_new_folio(struct folio *dst, struct folio *src,
*/
rc = mapping->a_ops->migrate_folio(mapping, dst, src,
mode);
- else if (mapping->a_ops->migratepage)
- rc = mapping->a_ops->migratepage(mapping, &dst->page,
- &src->page, mode);
else
rc = fallback_migrate_folio(mapping, dst, src, mode);
} else {
--
2.35.1
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2022-06-08 15:03 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-08 15:02 [Ocfs2-devel] [PATCH v2 00/19] Convert aops->migratepage to aops->migrate_folio Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 01/19] secretmem: Remove isolate_page Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-09 12:46 ` David Hildenbrand via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 02/19] mm: Convert all PageMovable users to movable_operations Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-09 10:23 ` David Hildenbrand via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 03/19] fs: Add aops->migrate_folio Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-09 12:50 ` David Hildenbrand via Ocfs2-devel
2022-06-09 14:35 ` Matthew Wilcox via Ocfs2-devel
2022-06-10 10:17 ` David Hildenbrand via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 04/19] mm/migrate: Convert fallback_migrate_page() to fallback_migrate_folio() Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 05/19] mm/migrate: Convert writeout() to take a folio Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 06/19] mm/migrate: Convert buffer_migrate_page() to buffer_migrate_folio() Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 07/19] mm/migrate: Convert expected_page_refs() to folio_expected_refs() Matthew Wilcox (Oracle) via Ocfs2-devel
[not found] ` <6e7599d1-8a5f-bf16-383c-febd753bd051@google.com>
2022-07-08 3:29 ` Matthew Wilcox via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 08/19] btrfs: Convert btree_migratepage to migrate_folio Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-09 16:25 ` David Sterba via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 09/19] nfs: Convert " Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 10/19] mm/migrate: Convert migrate_page() to migrate_folio() Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-09 16:26 ` David Sterba via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 11/19] mm/migrate: Add filemap_migrate_folio() Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:22 ` Darrick J. Wong via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 12/19] btrfs: Convert btrfs_migratepage to migrate_folio Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-09 16:33 ` David Sterba via Ocfs2-devel
2022-06-09 17:40 ` Matthew Wilcox via Ocfs2-devel
2022-06-09 23:05 ` David Sterba via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 13/19] ubifs: Convert to filemap_migrate_folio() Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 14/19] f2fs: " Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-15 8:11 ` [Ocfs2-devel] [f2fs-dev] " Chao Yu via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 15/19] aio: Convert to migrate_folio Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 16/19] hugetlb: " Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 17/19] secretmem: " Matthew Wilcox (Oracle) via Ocfs2-devel
2022-06-08 15:02 ` Matthew Wilcox (Oracle) via Ocfs2-devel [this message]
2022-06-08 15:02 ` [Ocfs2-devel] [PATCH v2 19/19] mm/folio-compat: Remove migration compatibility functions Matthew Wilcox (Oracle) via Ocfs2-devel
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=20220608150249.3033815-19-willy@infradead.org \
--to=ocfs2-devel@oss.oracle.com \
--cc=cluster-devel@redhat.com \
--cc=linux-aio@kvack.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=linux-xfs@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--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;
as well as URLs for NNTP newsgroup(s).