diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-02-09 20:22:03 +0000 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-03-15 08:34:38 -0400 |
| commit | 187c82cb03808ede4ee6f36aabbeb74213cd4928 (patch) | |
| tree | c923a9497b98d4b49b1c90a29e44685f59977c28 /fs/ext4 | |
| parent | 0079c3b17631c206eed77a8a17c513cc162b9f8d (diff) | |
fs: Convert trivial uses of __set_page_dirty_nobuffers to filemap_dirty_folio
These filesystems use __set_page_dirty_nobuffers() either directly or
with a very thin wrapper; convert them en masse.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 678ba122f8b1..c48dbbf0e9b2 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3541,22 +3541,23 @@ const struct iomap_ops ext4_iomap_report_ops = { }; /* - * Pages can be marked dirty completely asynchronously from ext4's journalling - * activity. By filemap_sync_pte(), try_to_unmap_one(), etc. We cannot do - * much here because ->set_page_dirty is called under VFS locks. The page is - * not necessarily locked. + * Folios can be marked dirty completely asynchronously from ext4's + * journalling activity. By filemap_sync_pte(), try_to_unmap_one(), etc. + * We cannot do much here because ->dirty_folio may be called with the + * page table lock held. The folio is not necessarily locked. * - * We cannot just dirty the page and leave attached buffers clean, because the + * We cannot just dirty the folio and leave attached buffers clean, because the * buffers' dirty state is "definitive". We cannot just set the buffers dirty * or jbddirty because all the journalling code will explode. * - * So what we do is to mark the page "pending dirty" and next time writepage + * So what we do is to mark the folio "pending dirty" and next time writepage * is called, propagate that into the buffers appropriately. */ -static int ext4_journalled_set_page_dirty(struct page *page) +static bool ext4_journalled_dirty_folio(struct address_space *mapping, + struct folio *folio) { - SetPageChecked(page); - return __set_page_dirty_nobuffers(page); + folio_set_checked(folio); + return filemap_dirty_folio(mapping, folio); } static int ext4_set_page_dirty(struct page *page) @@ -3598,7 +3599,7 @@ static const struct address_space_operations ext4_journalled_aops = { .writepages = ext4_writepages, .write_begin = ext4_write_begin, .write_end = ext4_journalled_write_end, - .set_page_dirty = ext4_journalled_set_page_dirty, + .dirty_folio = ext4_journalled_dirty_folio, .bmap = ext4_bmap, .invalidate_folio = ext4_journalled_invalidate_folio, .releasepage = ext4_releasepage, |