Revert "ext4: handle redirtying in ext4_bio_write_page()"

This reverts commit 952c89ac51.
This commit is contained in:
Ksawlii 2024-11-24 00:23:46 +01:00
parent b4445f415c
commit e254363d4c

View file

@ -493,13 +493,6 @@ 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;
@ -507,7 +500,6 @@ 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);
@ -550,10 +542,7 @@ 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 {
if (buffer_async_write(bh)) {
clear_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;
@ -566,6 +555,7 @@ 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: