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

iomap: Remove iomap_invalidatepage() 



Use iomap_invalidate_folio() in all the iomap-based filesystems
and rename the iomap_invalidatepage tracepoint.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs
parent 128d1f82

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static const struct address_space_operations gfs2_aops = { 
	.readahead = gfs2_readahead,

	.set_page_dirty = __set_page_dirty_nobuffers,

	.releasepage = iomap_releasepage,

	.invalidatepage = iomap_invalidatepage,

	.invalidate_folio = iomap_invalidate_folio,

	.bmap = gfs2_bmap,

	.direct_IO = noop_direct_IO,

	.migratepage = iomap_migrate_page,

fs/iomap/buffered-io.c

+1 −8
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ EXPORT_SYMBOL_GPL(iomap_releasepage); 


void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len)

{

	trace_iomap_invalidatepage(folio->mapping->host,

	trace_iomap_invalidate_folio(folio->mapping->host,

					folio_pos(folio) + offset, len);



	/*
@@ -496,13 +496,6 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len) 
}

EXPORT_SYMBOL_GPL(iomap_invalidate_folio);



void iomap_invalidatepage(struct page *page, unsigned int offset,

		unsigned int len)

{

	iomap_invalidate_folio(page_folio(page), offset, len);

}

EXPORT_SYMBOL_GPL(iomap_invalidatepage);



#ifdef CONFIG_MIGRATION

int

iomap_migrate_page(struct address_space *mapping, struct page *newpage,

fs/iomap/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ DEFINE_EVENT(iomap_range_class, name, \ 
	TP_ARGS(inode, off, len))

DEFINE_RANGE_EVENT(iomap_writepage);

DEFINE_RANGE_EVENT(iomap_releasepage);

DEFINE_RANGE_EVENT(iomap_invalidatepage);

DEFINE_RANGE_EVENT(iomap_invalidate_folio);

DEFINE_RANGE_EVENT(iomap_dio_invalidate_fail);



#define IOMAP_TYPE_STRINGS \

fs/xfs/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ const struct address_space_operations xfs_address_space_operations = { 
	.writepages		= xfs_vm_writepages,

	.set_page_dirty		= __set_page_dirty_nobuffers,

	.releasepage		= iomap_releasepage,

	.invalidatepage		= iomap_invalidatepage,

	.invalidate_folio	= iomap_invalidate_folio,

	.bmap			= xfs_vm_bmap,

	.direct_IO		= noop_direct_IO,

	.migratepage		= iomap_migrate_page,

fs/zonefs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static const struct address_space_operations zonefs_file_aops = { 
	.writepages		= zonefs_writepages,

	.set_page_dirty		= __set_page_dirty_nobuffers,

	.releasepage		= iomap_releasepage,

	.invalidatepage		= iomap_invalidatepage,

	.invalidate_folio	= iomap_invalidate_folio,

	.migratepage		= iomap_migrate_page,

	.is_partially_uptodate	= iomap_is_partially_uptodate,

	.error_remove_page	= generic_error_remove_page,