Commit 67235182 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

mm/migrate: Convert buffer_migrate_page() to buffer_migrate_folio() 



Use a folio throughout __buffer_migrate_folio(), add kernel-doc for
buffer_migrate_folio() and buffer_migrate_folio_norefs(), move their
declarations to buffer.h and switch all filesystems that have wired
them up.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 2be7fa10

block/fops.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ const struct address_space_operations def_blk_aops = { 
	.write_end	= blkdev_write_end,

	.writepages	= blkdev_writepages,

	.direct_IO	= blkdev_direct_IO,

	.migratepage	= buffer_migrate_page_norefs,

	.migrate_folio	= buffer_migrate_folio_norefs,

	.is_dirty_writeback = buffer_check_dirty_writeback,

};

fs/ext2/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ const struct address_space_operations ext2_aops = { 
	.bmap			= ext2_bmap,

	.direct_IO		= ext2_direct_IO,

	.writepages		= ext2_writepages,

	.migratepage		= buffer_migrate_page,

	.migrate_folio		= buffer_migrate_folio,

	.is_partially_uptodate	= block_is_partially_uptodate,

	.error_remove_page	= generic_error_remove_page,

};
@@ -989,7 +989,7 @@ const struct address_space_operations ext2_nobh_aops = { 
	.bmap			= ext2_bmap,

	.direct_IO		= ext2_direct_IO,

	.writepages		= ext2_writepages,

	.migratepage		= buffer_migrate_page,

	.migrate_folio		= buffer_migrate_folio,

	.error_remove_page	= generic_error_remove_page,

};

fs/ext4/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -3633,7 +3633,7 @@ static const struct address_space_operations ext4_aops = { 
	.invalidate_folio	= ext4_invalidate_folio,

	.release_folio		= ext4_release_folio,

	.direct_IO		= noop_direct_IO,

	.migratepage		= buffer_migrate_page,

	.migrate_folio		= buffer_migrate_folio,

	.is_partially_uptodate  = block_is_partially_uptodate,

	.error_remove_page	= generic_error_remove_page,

	.swap_activate		= ext4_iomap_swap_activate,
@@ -3668,7 +3668,7 @@ static const struct address_space_operations ext4_da_aops = { 
	.invalidate_folio	= ext4_invalidate_folio,

	.release_folio		= ext4_release_folio,

	.direct_IO		= noop_direct_IO,

	.migratepage		= buffer_migrate_page,

	.migrate_folio		= buffer_migrate_folio,

	.is_partially_uptodate  = block_is_partially_uptodate,

	.error_remove_page	= generic_error_remove_page,

	.swap_activate		= ext4_iomap_swap_activate,

fs/ntfs/aops.c

+3 −3
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ const struct address_space_operations ntfs_normal_aops = { 
	.dirty_folio	= block_dirty_folio,

#endif /* NTFS_RW */

	.bmap		= ntfs_bmap,

	.migratepage	= buffer_migrate_page,

	.migrate_folio	= buffer_migrate_folio,

	.is_partially_uptodate = block_is_partially_uptodate,

	.error_remove_page = generic_error_remove_page,

};
@@ -1673,7 +1673,7 @@ const struct address_space_operations ntfs_compressed_aops = { 
	.writepage	= ntfs_writepage,

	.dirty_folio	= block_dirty_folio,

#endif /* NTFS_RW */

	.migratepage	= buffer_migrate_page,

	.migrate_folio	= buffer_migrate_folio,

	.is_partially_uptodate = block_is_partially_uptodate,

	.error_remove_page = generic_error_remove_page,

};
@@ -1688,7 +1688,7 @@ const struct address_space_operations ntfs_mst_aops = { 
	.writepage	= ntfs_writepage,	/* Write dirty page to disk. */

	.dirty_folio	= filemap_dirty_folio,

#endif /* NTFS_RW */

	.migratepage	= buffer_migrate_page,

	.migrate_folio	= buffer_migrate_folio,

	.is_partially_uptodate	= block_is_partially_uptodate,

	.error_remove_page = generic_error_remove_page,

};

fs/ocfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -2462,7 +2462,7 @@ const struct address_space_operations ocfs2_aops = { 
	.direct_IO		= ocfs2_direct_IO,

	.invalidate_folio	= block_invalidate_folio,

	.release_folio		= ocfs2_release_folio,

	.migratepage		= buffer_migrate_page,

	.migrate_folio		= buffer_migrate_folio,

	.is_partially_uptodate	= block_is_partially_uptodate,

	.error_remove_page	= generic_error_remove_page,

};