btrfs: Move free_pages_out label in inline extent handling branch in compress_file_range
authorNikolay Borisov <nborisov@suse.com>
Wed, 17 Jul 2019 11:41:45 +0000 (14:41 +0300)
committerDavid Sterba <dsterba@suse.com>
Mon, 9 Sep 2019 12:58:59 +0000 (14:58 +0200)
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>
fs/btrfs/inode.c

index db814f5..385127a 100644 (file)
@@ -622,7 +622,14 @@ cont:
                                                     PAGE_SET_WRITEBACK |
                                                     page_error_op |
                                                     PAGE_END_WRITEBACK);
-                       goto free_pages_out;
+
+                       for (i = 0; i < nr_pages; i++) {
+                               WARN_ON(pages[i]->mapping);
+                               put_page(pages[i]);
+                       }
+                       kfree(pages);
+
+                       return 0;
                }
        }
 
@@ -700,15 +707,6 @@ cleanup_and_bail_uncompressed:
        compressed_extents++;
 
        return compressed_extents;
-
-free_pages_out:
-       for (i = 0; i < nr_pages; i++) {
-               WARN_ON(pages[i]->mapping);
-               put_page(pages[i]);
-       }
-       kfree(pages);
-
-       return 0;
 }
 
 static void free_async_extent_pages(struct async_extent *async_extent)