diff options
| author | David Sterba <dsterba@suse.com> | 2016-04-26 19:02:15 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-04-29 05:01:47 -0400 |
| commit | b5a4ba14e0caa9da1b3b98939274bdeda71859e3 (patch) | |
| tree | 03412f29bf220900dfe348de5dcd42a9432bd4f2 | |
| parent | 2c53b912ae317e560bce1fc446e76915a5b30587 (diff) | |
btrfs: untangle gotos a bit in __set_extent_bit
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/extent_io.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 0c9b11924f74..f5eda54e225f 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
| @@ -1037,7 +1037,13 @@ hit_next: | |||
| 1037 | goto out; | 1037 | goto out; |
| 1038 | } | 1038 | } |
| 1039 | 1039 | ||
| 1040 | goto search_again; | 1040 | search_again: |
| 1041 | if (start > end) | ||
| 1042 | goto out; | ||
| 1043 | spin_unlock(&tree->lock); | ||
| 1044 | if (gfpflags_allow_blocking(mask)) | ||
| 1045 | cond_resched(); | ||
| 1046 | goto again; | ||
| 1041 | 1047 | ||
| 1042 | out: | 1048 | out: |
| 1043 | spin_unlock(&tree->lock); | 1049 | spin_unlock(&tree->lock); |
| @@ -1046,13 +1052,6 @@ out: | |||
| 1046 | 1052 | ||
| 1047 | return err; | 1053 | return err; |
| 1048 | 1054 | ||
| 1049 | search_again: | ||
| 1050 | if (start > end) | ||
| 1051 | goto out; | ||
| 1052 | spin_unlock(&tree->lock); | ||
| 1053 | if (gfpflags_allow_blocking(mask)) | ||
| 1054 | cond_resched(); | ||
| 1055 | goto again; | ||
| 1056 | } | 1055 | } |
| 1057 | 1056 | ||
| 1058 | int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, | 1057 | int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, |
