]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
orangefs: Remove orangefs_writepage()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 5 Mar 2025 20:47:28 +0000 (20:47 +0000)
committerChristian Brauner <brauner@kernel.org>
Thu, 6 Mar 2025 08:26:06 +0000 (09:26 +0100)
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)" <willy@infradead.org>
Link: https://lore.kernel.org/r/20250305204734.1475264-5-willy@infradead.org
Tested-by: Mike Marshall <hubcap@omnibond.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/orangefs/inode.c

index 63d7c1ca0dfd35c90bb5e7728bb55e4275677333..4ad049d5cc9cd08c2a1bb0c9a1efffb0abcf3a5e 100644 (file)
@@ -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,
 };