ext4: handle redirtying in ext4_bio_write_page()

commit 04e568a3b31cfbd545c04c8bfc35c20e5ccfce0f upstream.

Since we want to transition transaction commits to use ext4_writepages()
for writing back ordered, add handling of page redirtying into
ext4_bio_write_page(). Also move buffer dirty bit clearing into the same
place other buffer state handling.

Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20221207112722.22220-1-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index a94cc7b22d7ea59c17ab2ebd5b2ba1ef5a223ea1..1a371eb4470eb2d5816d43d66dfd3b4721ce978c 100644 (file)
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -493,6 +493,13 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
                        /* A hole? We can safely clear the dirty bit */
                        if (!buffer_mapped(bh))
                                clear_buffer_dirty(bh);
+                       /*
+                        * Keeping dirty some buffer we cannot write? Make
+                        * sure to redirty the page. This happens e.g. when
+                        * doing writeout for transaction commit.
+                        */
+                       if (buffer_dirty(bh) && !PageDirty(page))
+                               redirty_page_for_writepage(wbc, page);
                        if (io->io_bio)
                                ext4_io_submit(io);
                        continue;
@@ -500,6 +507,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
                if (buffer_new(bh))
                        clear_buffer_new(bh);
                set_buffer_async_write(bh);
+               clear_buffer_dirty(bh);
                nr_to_submit++;
        } while ((bh = bh->b_this_page) != head);
 
@@ -542,7 +550,10 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
                        printk_ratelimited(KERN_ERR "%s: ret = %d\n", __func__, ret);
                        redirty_page_for_writepage(wbc, page);
                        do {
-                               clear_buffer_async_write(bh);
+                               if (buffer_async_write(bh)) {
+                                       clear_buffer_async_write(bh);
+                                       set_buffer_dirty(bh);
+                               }
                                bh = bh->b_this_page;
                        } while (bh != head);
                        goto unlock;
@@ -555,7 +566,6 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
                        continue;
                io_submit_add_bh(io, inode, page, bounce_page, bh);
                nr_submitted++;
-               clear_buffer_dirty(bh);
        } while ((bh = bh->b_this_page) != head);
 
 unlock: