|
@@ -1134,11 +1134,11 @@ int find_free_dev_extent(struct btrfs_trans_handle *trans,
|
|
|
path = btrfs_alloc_path();
|
|
|
if (!path)
|
|
|
return -ENOMEM;
|
|
|
-again:
|
|
|
+
|
|
|
max_hole_start = search_start;
|
|
|
max_hole_size = 0;
|
|
|
- hole_size = 0;
|
|
|
|
|
|
+again:
|
|
|
if (search_start >= search_end || device->is_tgtdev_for_dev_replace) {
|
|
|
ret = -ENOSPC;
|
|
|
goto out;
|
|
@@ -1231,21 +1231,23 @@ next:
|
|
|
* allocated dev extents, and when shrinking the device,
|
|
|
* search_end may be smaller than search_start.
|
|
|
*/
|
|
|
- if (search_end > search_start)
|
|
|
+ if (search_end > search_start) {
|
|
|
hole_size = search_end - search_start;
|
|
|
|
|
|
- if (hole_size > max_hole_size) {
|
|
|
- max_hole_start = search_start;
|
|
|
- max_hole_size = hole_size;
|
|
|
- }
|
|
|
+ if (contains_pending_extent(trans, device, &search_start,
|
|
|
+ hole_size)) {
|
|
|
+ btrfs_release_path(path);
|
|
|
+ goto again;
|
|
|
+ }
|
|
|
|
|
|
- if (contains_pending_extent(trans, device, &search_start, hole_size)) {
|
|
|
- btrfs_release_path(path);
|
|
|
- goto again;
|
|
|
+ if (hole_size > max_hole_size) {
|
|
|
+ max_hole_start = search_start;
|
|
|
+ max_hole_size = hole_size;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/* See above. */
|
|
|
- if (hole_size < num_bytes)
|
|
|
+ if (max_hole_size < num_bytes)
|
|
|
ret = -ENOSPC;
|
|
|
else
|
|
|
ret = 0;
|