From: David Sterba <dsterba@suse.com>
Date: Tue, 26 Apr 2016 23:02:15 +0000 (+0200)
Subject: btrfs: untangle gotos a bit in convert_extent_bit
X-Git-Tag: v4.7-rc1~21^2~1^2~1^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=03bf5387708069194fbe5072fb57f9542e7a8b82;p=karo-tx-linux.git

btrfs: untangle gotos a bit in convert_extent_bit

Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 3ecd8b1f239f..d39e2241ceb7 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1262,15 +1262,6 @@ hit_next:
 		goto out;
 	}
 
-	goto search_again;
-
-out:
-	spin_unlock(&tree->lock);
-	if (prealloc)
-		free_extent_state(prealloc);
-
-	return err;
-
 search_again:
 	if (start > end)
 		goto out;
@@ -1279,6 +1270,13 @@ search_again:
 		cond_resched();
 	first_iteration = false;
 	goto again;
+
+out:
+	spin_unlock(&tree->lock);
+	if (prealloc)
+		free_extent_state(prealloc);
+
+	return err;
 }
 
 /* wrappers around set/clear extent bit */