btrfs: Move free_pages_out label in inline extent handling branch in compress_file_range

[ Upstream commit cecc8d9038d164eda61fbcd72520975a554ea63e ]

This label is only executed if compress_file_range fails to create an
inline extent. So move its code in the semantically related inline
extent handling branch. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 57908ee964a20d4d1ce64108f7fc70c51586ba65..dc520749f51db19323d7120d61c10eb2294f3fca 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -629,7 +629,14 @@ cont:
                                btrfs_free_reserved_data_space_noquota(inode,
                                                               start,
                                                               end - start + 1);
-                       goto free_pages_out;
+
+                       for (i = 0; i < nr_pages; i++) {
+                               WARN_ON(pages[i]->mapping);
+                               put_page(pages[i]);
+                       }
+                       kfree(pages);
+
+                       return;
                }
        }
 
@@ -708,13 +715,6 @@ cleanup_and_bail_uncompressed:
        *num_added += 1;
 
        return;
-
-free_pages_out:
-       for (i = 0; i < nr_pages; i++) {
-               WARN_ON(pages[i]->mapping);
-               put_page(pages[i]);
-       }
-       kfree(pages);
 }
 
 static void free_async_extent_pages(struct async_extent *async_extent)