From: Nikolay Borisov <nborisov@suse.com>
Date: Wed, 17 Jul 2019 11:41:45 +0000 (+0300)
Subject: btrfs: Move free_pages_out label in inline extent handling branch in compress_file_range
X-Git-Tag: v5.4-rc1~1^2~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cecc8d9038d164eda61fbcd72520975a554ea63e;p=platform%2Fkernel%2Flinux-rpi.git

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

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>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index db814f5..385127a 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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)