]> git.ipfire.org Git - people/ms/linux.git/commitdiff
gfs2: remove ->writepage
authorChristoph Hellwig <hch@lst.de>
Fri, 22 Jul 2022 17:59:16 +0000 (10:59 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Fri, 22 Jul 2022 17:59:16 +0000 (10:59 -0700)
->writepage is only used for single page writeback from memory reclaim,
and not called at all for cgroup writeback.  Follow the lead of XFS
and remove ->writepage and rely entirely on ->writepages.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
fs/gfs2/aops.c

index 106e90a365838efee54e8e3a6f8bfa77d52a536c..0240a1a717f56246861646a3bd067b6b6fd00a4d 100644 (file)
@@ -81,31 +81,6 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock,
        return 0;
 }
 
-/**
- * gfs2_writepage - Write page for writeback mappings
- * @page: The page
- * @wbc: The writeback control
- */
-static int gfs2_writepage(struct page *page, struct writeback_control *wbc)
-{
-       struct inode *inode = page->mapping->host;
-       struct gfs2_inode *ip = GFS2_I(inode);
-       struct gfs2_sbd *sdp = GFS2_SB(inode);
-       struct iomap_writepage_ctx wpc = { };
-
-       if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl)))
-               goto out;
-       if (current->journal_info)
-               goto redirty;
-       return iomap_writepage(page, wbc, &wpc, &gfs2_writeback_ops);
-
-redirty:
-       redirty_page_for_writepage(wbc, page);
-out:
-       unlock_page(page);
-       return 0;
-}
-
 /**
  * gfs2_write_jdata_page - gfs2 jdata-specific version of block_write_full_page
  * @page: The page to write
@@ -765,7 +740,6 @@ cannot_release:
 }
 
 static const struct address_space_operations gfs2_aops = {
-       .writepage = gfs2_writepage,
        .writepages = gfs2_writepages,
        .read_folio = gfs2_read_folio,
        .readahead = gfs2_readahead,