diff options
| author | Jan Kara <jack@suse.cz> | 2023-02-28 08:13:16 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-03-23 17:06:07 +0300 |
| commit | f1496362e9d7b37fe6b8983086c1548a601b5594 (patch) | |
| tree | 82021c1eb96717e0b3223d1aaa5db532e5cdcb50 | |
| parent | 3f5d30636d2a188ee3cd22c6fef1ace5304a07bf (diff) | |
| download | linux-f1496362e9d7b37fe6b8983086c1548a601b5594.tar.xz | |
ext4: Don't unlock page in ext4_bio_write_page()
Do not unlock the written page in ext4_bio_write_page(). Instead leave
the page locked and unlock it in the callers. We'll need to keep the
page locked for data=journal writeback for a bit longer.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Link: https://lore.kernel.org/r/20230228051319.4085470-5-tytso@mit.edu
| -rw-r--r-- | fs/ext4/inode.c | 2 | ||||
| -rw-r--r-- | fs/ext4/page-io.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 118eb674038a..fcaa2a7a27a5 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2076,6 +2076,7 @@ static int ext4_writepage(struct page *page, return -ENOMEM; } ret = ext4_bio_write_page(&io_submit, page, len); + unlock_page(page); ext4_io_submit(&io_submit); /* Drop io_end reference we got from init */ ext4_put_io_end_defer(io_submit.io_end); @@ -2110,6 +2111,7 @@ static int mpage_submit_page(struct mpage_da_data *mpd, struct page *page) else len = PAGE_SIZE; err = ext4_bio_write_page(&mpd->io_submit, page, len); + unlock_page(page); if (!err) mpd->wbc->nr_to_write--; mpd->first_page++; diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 1e4db96a04e6..8703fd732abb 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -502,7 +502,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, /* Nothing to submit? Just unlock the page... */ if (!nr_to_submit) - goto unlock; + return 0; bh = head = page_buffers(page); @@ -550,7 +550,8 @@ int ext4_bio_write_page(struct ext4_io_submit *io, } bh = bh->b_this_page; } while (bh != head); - goto unlock; + + return ret; } } @@ -565,7 +566,6 @@ int ext4_bio_write_page(struct ext4_io_submit *io, continue; io_submit_add_bh(io, inode, page, bounce_page, bh); } while ((bh = bh->b_this_page) != head); -unlock: - unlock_page(page); - return ret; + + return 0; } |