hfsplus: really remove hfsplus_writepage
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Fri, 15 Dec 2023 20:02:39 +0000 (20:02 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 29 Dec 2023 19:58:34 +0000 (11:58 -0800)
The earlier commit to remove hfsplus_writepage only removed it from one of
the aops.  Remove it from the btree_aops as well.

Link: https://lkml.kernel.org/r/20231215200245.748418-9-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/hfsplus/inode.c

index 702a0663b1d8a3d9c1ae7d3fdcf79d61da48ed94..3d326926c195c1d58441c218bcb811b430458cc7 100644 (file)
@@ -28,11 +28,6 @@ static int hfsplus_read_folio(struct file *file, struct folio *folio)
        return block_read_full_folio(folio, hfsplus_get_block);
 }
 
-static int hfsplus_writepage(struct page *page, struct writeback_control *wbc)
-{
-       return block_write_full_page(page, hfsplus_get_block, wbc);
-}
-
 static void hfsplus_write_failed(struct address_space *mapping, loff_t to)
 {
        struct inode *inode = mapping->host;
@@ -159,9 +154,10 @@ const struct address_space_operations hfsplus_btree_aops = {
        .dirty_folio    = block_dirty_folio,
        .invalidate_folio = block_invalidate_folio,
        .read_folio     = hfsplus_read_folio,
-       .writepage      = hfsplus_writepage,
+       .writepages     = hfsplus_writepages,
        .write_begin    = hfsplus_write_begin,
        .write_end      = generic_write_end,
+       .migrate_folio  = buffer_migrate_folio,
        .bmap           = hfsplus_bmap,
        .release_folio  = hfsplus_release_folio,
 };