Skip to content

Commit 506382d

Browse files
Matthew Wilcox (Oracle)brauner
authored andcommitted
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)" <[email protected]> Link: https://lore.kernel.org/r/[email protected] Tested-by: Mike Marshall <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 144fa8a commit 506382d

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

fs/orangefs/inode.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ static int orangefs_writepage_locked(struct page *page,
6464
return ret;
6565
}
6666

67-
static int orangefs_writepage(struct page *page, struct writeback_control *wbc)
68-
{
69-
int ret;
70-
ret = orangefs_writepage_locked(page, wbc);
71-
unlock_page(page);
72-
end_page_writeback(page);
73-
return ret;
74-
}
75-
7667
struct orangefs_writepages {
7768
loff_t off;
7869
size_t len;
@@ -605,7 +596,6 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb,
605596

606597
/** ORANGEFS2 implementation of address space operations */
607598
static const struct address_space_operations orangefs_address_operations = {
608-
.writepage = orangefs_writepage,
609599
.readahead = orangefs_readahead,
610600
.read_folio = orangefs_read_folio,
611601
.writepages = orangefs_writepages,
@@ -615,6 +605,7 @@ static const struct address_space_operations orangefs_address_operations = {
615605
.invalidate_folio = orangefs_invalidate_folio,
616606
.release_folio = orangefs_release_folio,
617607
.free_folio = orangefs_free_folio,
608+
.migrate_folio = filemap_migrate_folio,
618609
.launder_folio = orangefs_launder_folio,
619610
.direct_IO = orangefs_direct_IO,
620611
};

0 commit comments

Comments
 (0)