diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-10-05 11:05:51 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-05 11:05:51 +0300 |
| commit | 3fc18b06b8f3408951b5e43548f22984412b0831 (patch) | |
| tree | 5d509acc9a9010aae791cdba9e9f6a02e94b962c /fs/btrfs/volumes.c | |
| parent | a11e097504ac1889b35b6858f495565838325f88 (diff) | |
| parent | 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa (diff) | |
| download | linux-3fc18b06b8f3408951b5e43548f22984412b0831.tar.xz | |
Merge tag 'v6.6-rc4' into x86/entry, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 9621455edebc..5a5a8d488a7b 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1594,7 +1594,7 @@ static int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes, u64 search_start; u64 hole_size; u64 max_hole_start; - u64 max_hole_size; + u64 max_hole_size = 0; u64 extent_end; u64 search_end = device->total_bytes; int ret; @@ -1602,17 +1602,16 @@ static int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes, struct extent_buffer *l; search_start = dev_extent_search_start(device); + max_hole_start = search_start; WARN_ON(device->zone_info && !IS_ALIGNED(num_bytes, device->zone_info->zone_size)); path = btrfs_alloc_path(); - if (!path) - return -ENOMEM; - - max_hole_start = search_start; - max_hole_size = 0; - + if (!path) { + ret = -ENOMEM; + goto out; + } again: if (search_start >= search_end || test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) { |