Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ext4: handle redirtying in ext4_bio_write_page()

Browse source 
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>
This commit is contained in:
Jan Kara 2022-12-07 12:27:04 +01:00 committed by Ksawlii
parent 8f803ffb64
commit 58889da59d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/ext4/page-io.c
View file

@ -493,6 +493,13 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
/* A hole? We can safely clear the dirty bit */ /* A hole? We can safely clear the dirty bit */
if (!buffer_mapped(bh)) if (!buffer_mapped(bh))
clear_buffer_dirty(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) if (io->io_bio)
ext4_io_submit(io); ext4_io_submit(io);
continue; continue;
@ -500,6 +507,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
if (buffer_new(bh)) if (buffer_new(bh))
clear_buffer_new(bh); clear_buffer_new(bh);
set_buffer_async_write(bh); set_buffer_async_write(bh);
clear_buffer_dirty(bh);
nr_to_submit++; nr_to_submit++;
} while ((bh = bh->b_this_page) != head); } 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); printk_ratelimited(KERN_ERR "%s: ret = %d\n", __func__, ret);
redirty_page_for_writepage(wbc, page); redirty_page_for_writepage(wbc, page);
do { 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; bh = bh->b_this_page;
} while (bh != head); } while (bh != head);
goto unlock; goto unlock;
@ -555,7 +566,6 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
continue; continue;
io_submit_add_bh(io, inode, page, bounce_page, bh); io_submit_add_bh(io, inode, page, bounce_page, bh);
nr_submitted++; nr_submitted++;
clear_buffer_dirty(bh);
} while ((bh = bh->b_this_page) != head); } while ((bh = bh->b_this_page) != head);
unlock: unlock: