ext4: Move mpage_page_done() calls after error handling

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@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Link: https://lore.kernel.org/r/20230228051319.4085470-7-tytso@mit.edu

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 85951da08d6021df0131999d548f99233998b9bf..472f6b914f482a443b5b71e4c625e570c8dea07a 100644 (file)
--- 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) <<