OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-06-06 11:53:31 -04:00
parent 5409548df3
commit 9d0ddc0cb5
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/fs.h
View File

@ -367,8 +367,6 @@ struct address_space_operations {
*/ */
int (*migrate_folio)(struct address_space *, struct folio *dst, int (*migrate_folio)(struct address_space *, struct folio *dst,
struct folio *src, enum migrate_mode); struct folio *src, enum migrate_mode);
int (*migratepage) (struct address_space *,
struct page *, struct page *, enum migrate_mode);
int (*launder_folio)(struct folio *); int (*launder_folio)(struct folio *);
bool (*is_partially_uptodate) (struct folio *, size_t from, bool (*is_partially_uptodate) (struct folio *, size_t from,
size_t count); size_t count);

5
mm/compaction.c
View File

@ -1031,7 +1031,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
/* /*
* Only pages without mappings or that have a * 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 * without blocking. However, we can be racing with
* truncation so it's necessary to lock the page * truncation so it's necessary to lock the page
* to stabilise the mapping as truncation holds * 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); mapping = page_mapping(page);
migrate_dirty = !mapping || migrate_dirty = !mapping ||
mapping->a_ops->migrate_folio || mapping->a_ops->migrate_folio;
mapping->a_ops->migratepage;
unlock_page(page); unlock_page(page);
if (!migrate_dirty) if (!migrate_dirty)
goto isolate_fail_put; goto isolate_fail_put;

3
mm/migrate.c
View File

@ -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, rc = mapping->a_ops->migrate_folio(mapping, dst, src,
mode); mode);
else if (mapping->a_ops->migratepage)
rc = mapping->a_ops->migratepage(mapping, &dst->page,
&src->page, mode);
else else
rc = fallback_migrate_folio(mapping, dst, src, mode); rc = fallback_migrate_folio(mapping, dst, src, mode);
} else { } else {