From: Matthew Wilcox (Oracle) Date: Wed, 5 Mar 2025 20:47:28 +0000 (+0000) Subject: orangefs: Remove orangefs_writepage() X-Git-Tag: v6.15-rc1~239^2^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=506382dbbedc04a12a35404b6c2c486a828f1278;p=thirdparty%2Fkernel%2Flinux.git orangefs: Remove orangefs_writepage() If we add a migrate_folio operation, we can remove orangefs_writepage (as there is already a writepages operation). filemap_migrate_folio() will do fine as struct orangefs_write_range does not need to be adjusted when the folio is migrated. Signed-off-by: "Matthew Wilcox (Oracle)" Link: https://lore.kernel.org/r/20250305204734.1475264-5-willy@infradead.org Tested-by: Mike Marshall Signed-off-by: Christian Brauner --- diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 63d7c1ca0dfd3..4ad049d5cc9cd 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -64,15 +64,6 @@ static int orangefs_writepage_locked(struct page *page, return ret; } -static int orangefs_writepage(struct page *page, struct writeback_control *wbc) -{ - int ret; - ret = orangefs_writepage_locked(page, wbc); - unlock_page(page); - end_page_writeback(page); - return ret; -} - struct orangefs_writepages { loff_t off; size_t len; @@ -605,7 +596,6 @@ out: /** ORANGEFS2 implementation of address space operations */ static const struct address_space_operations orangefs_address_operations = { - .writepage = orangefs_writepage, .readahead = orangefs_readahead, .read_folio = orangefs_read_folio, .writepages = orangefs_writepages, @@ -615,6 +605,7 @@ static const struct address_space_operations orangefs_address_operations = { .invalidate_folio = orangefs_invalidate_folio, .release_folio = orangefs_release_folio, .free_folio = orangefs_free_folio, + .migrate_folio = filemap_migrate_folio, .launder_folio = orangefs_launder_folio, .direct_IO = orangefs_direct_IO, };