From: Jan Kara Date: Wed, 29 Mar 2023 15:49:34 +0000 (+0200) Subject: ext4: Keep pages with journalled data dirty X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=265e72efa99fcc0959f8d33d346a7e0f2e3fe201;p=linux.git ext4: Keep pages with journalled data dirty Currently we clear page dirty bit when we checkpoint some buffers from a page with journalled data or when we perform delayed dirtying of a page in ext4_writepages(). In a quest to simplify handling of journalled data we want to keep page dirty as long as it has either buffers to checkpoint or journalled dirty data. So make sure to keep page dirty in ext4_writepages() if it still has journalled data attached to it. Signed-off-by: Jan Kara Link: https://lore.kernel.org/r/20230329154950.19720-3-jack@suse.cz Signed-off-by: Theodore Ts'o --- diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c5de0c04204cb..473226783d003 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2393,7 +2393,6 @@ static int mpage_journal_page_buffers(handle_t *handle, int len; ClearPageChecked(page); - clear_page_dirty_for_io(page); mpd->wbc->nr_to_write--; if (page->index == size >> PAGE_SHIFT && diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 8fe1875b0a420..2e5e94219693b 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -479,9 +479,11 @@ int ext4_bio_write_folio(struct ext4_io_submit *io, struct folio *folio, * to redirty the folio and keep TOWRITE tag so that * racing WB_SYNC_ALL writeback does not skip the folio. * This happens e.g. when doing writeout for - * transaction commit. + * transaction commit or when journalled data is not + * yet committed. */ - if (buffer_dirty(bh)) { + if (buffer_dirty(bh) || + (buffer_jbd(bh) && buffer_jbddirty(bh))) { if (!folio_test_dirty(folio)) folio_redirty_for_writepage(wbc, folio); keep_towrite = true;