Revert "ext4: handle redirtying in ext4_bio_write_page()"
This reverts commit 952c89ac51
.
This commit is contained in:
parent
b4445f415c
commit
e254363d4c
1 changed files with 2 additions and 12 deletions
|
@ -493,13 +493,6 @@ 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;
|
||||
|
@ -507,7 +500,6 @@ 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);
|
||||
|
||||
|
@ -550,10 +542,7 @@ 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 {
|
||||
if (buffer_async_write(bh)) {
|
||||
clear_buffer_async_write(bh);
|
||||
set_buffer_dirty(bh);
|
||||
}
|
||||
clear_buffer_async_write(bh);
|
||||
bh = bh->b_this_page;
|
||||
} while (bh != head);
|
||||
goto unlock;
|
||||
|
@ -566,6 +555,7 @@ 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:
|
||||
|
|
Loading…
Reference in a new issue