From: Jan Kara <jack@xxxxxxx>
In case mpage_submit_page() returns error, it doesn't really matter
whether we call mpage_page_done() and then return error or whether we
return directly because in that case page cleanup will be done by
mpage_release_unused_pages() instead. Logically, it makes more sense to
leave the cleanup to mpage_release_unused_pages() because we didn't
succeed in writing the page. So move mpage_page_done() calls after the
error handling.
Signed-off-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
---
fs/ext4/inode.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index a1fe5e3e7697..e6c453bf953e 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2230,9 +2230,9 @@ static int mpage_process_page_bufs(struct mpage_da_data *mpd,
/* So far everything mapped? Submit the page for IO. */
if (mpd->map.m_len == 0) {
err = mpage_submit_page(mpd, head->b_page);
- mpage_page_done(mpd, head->b_page);
if (err < 0)
return err;
+ mpage_page_done(mpd, head->b_page);
}
if (lblk >= blocks) {
mpd->scanned_until_end = 1;
@@ -2362,9 +2362,9 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)
goto out;
/* Page fully mapped - let IO run! */
err = mpage_submit_page(mpd, page);
- mpage_page_done(mpd, page);
if (err < 0)
goto out;
+ mpage_page_done(mpd, page);
}
folio_batch_release(&fbatch);
}
@@ -2672,11 +2672,12 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)
* modify metadata is simple. Just submit the page.
*/
if (!mpd->can_map) {
- if (ext4_page_nomap_can_writeout(&folio->page))
+ if (ext4_page_nomap_can_writeout(&folio->page)) {
err = mpage_submit_page(mpd, &folio->page);
+ if (err < 0)
+ goto out;
+ }
mpage_page_done(mpd, &folio->page);
- if (err < 0)
- goto out;
} else {
/* Add all dirty buffers to mpd */
lblk = ((ext4_lblk_t)folio->index) <<
--
2.31.0
