summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-06-06 11:53:31 -0400
committerMatthew Wilcox (Oracle) <willy@infradead.org>2022-08-02 12:34:04 -0400
commit9d0ddc0cb575fd41ff16131b06e08e1feac43b81 (patch)
treecd3a7d5812d96d0c5e7a92f3a9657615fe9d3e50
parent5409548df3876a6fa9115bce237c93c3d50d6cb6 (diff)
downloadlinux-9d0ddc0cb575fd41ff16131b06e08e1feac43b81.tar.gz
linux-9d0ddc0cb575fd41ff16131b06e08e1feac43b81.tar.bz2
linux-9d0ddc0cb575fd41ff16131b06e08e1feac43b81.zip
fs: Remove aops->migratepage()
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>
-rw-r--r--include/linux/fs.h2
-rw-r--r--mm/compaction.c5
-rw-r--r--mm/migrate.c3
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 0dd3ec9525b3..1b4b977809a1 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 {