mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 18:30:06 +00:00
Btrfs: remove search_start and search_end from find_free_extent and callers
We have been passing nothing but (u64)-1 to find_free_extent for search_end in all of the callers, so it's completely useless, and we've always been passing 0 in as search_start, so just remove them as function arguments and move search_start into find_free_extent. Thanks, Signed-off-by: Josef Bacik <josef@redhat.com>
This commit is contained in:
parent
285ff5af6c
commit
81c9ad237c
3 changed files with 9 additions and 19 deletions
|
@ -2466,8 +2466,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
|
|||
struct btrfs_root *root,
|
||||
u64 num_bytes, u64 min_alloc_size,
|
||||
u64 empty_size, u64 hint_byte,
|
||||
u64 search_end, struct btrfs_key *ins,
|
||||
u64 data);
|
||||
struct btrfs_key *ins, u64 data);
|
||||
int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
||||
struct extent_buffer *buf, int full_backref, int for_cow);
|
||||
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
||||
|
|
|
@ -5277,7 +5277,6 @@ enum btrfs_loop_type {
|
|||
static noinline int find_free_extent(struct btrfs_trans_handle *trans,
|
||||
struct btrfs_root *orig_root,
|
||||
u64 num_bytes, u64 empty_size,
|
||||
u64 search_start, u64 search_end,
|
||||
u64 hint_byte, struct btrfs_key *ins,
|
||||
u64 data)
|
||||
{
|
||||
|
@ -5286,6 +5285,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
|
|||
struct btrfs_free_cluster *last_ptr = NULL;
|
||||
struct btrfs_block_group_cache *block_group = NULL;
|
||||
struct btrfs_block_group_cache *used_block_group;
|
||||
u64 search_start = 0;
|
||||
int empty_cluster = 2 * 1024 * 1024;
|
||||
int allowed_chunk_alloc = 0;
|
||||
int done_chunk_alloc = 0;
|
||||
|
@ -5569,11 +5569,6 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
|
|||
}
|
||||
checks:
|
||||
search_start = stripe_align(root, offset);
|
||||
/* move on to the next group */
|
||||
if (search_start + num_bytes >= search_end) {
|
||||
btrfs_add_free_space(used_block_group, offset, num_bytes);
|
||||
goto loop;
|
||||
}
|
||||
|
||||
/* move on to the next group */
|
||||
if (search_start + num_bytes >
|
||||
|
@ -5721,12 +5716,10 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
|
|||
struct btrfs_root *root,
|
||||
u64 num_bytes, u64 min_alloc_size,
|
||||
u64 empty_size, u64 hint_byte,
|
||||
u64 search_end, struct btrfs_key *ins,
|
||||
u64 data)
|
||||
struct btrfs_key *ins, u64 data)
|
||||
{
|
||||
bool final_tried = false;
|
||||
int ret;
|
||||
u64 search_start = 0;
|
||||
|
||||
data = btrfs_get_alloc_profile(root, data);
|
||||
again:
|
||||
|
@ -5741,8 +5734,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
|
|||
|
||||
WARN_ON(num_bytes < root->sectorsize);
|
||||
ret = find_free_extent(trans, root, num_bytes, empty_size,
|
||||
search_start, search_end, hint_byte,
|
||||
ins, data);
|
||||
hint_byte, ins, data);
|
||||
|
||||
if (ret == -ENOSPC) {
|
||||
if (!final_tried) {
|
||||
|
@ -6137,7 +6129,7 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
|
|||
return ERR_CAST(block_rsv);
|
||||
|
||||
ret = btrfs_reserve_extent(trans, root, blocksize, blocksize,
|
||||
empty_size, hint, (u64)-1, &ins, 0);
|
||||
empty_size, hint, &ins, 0);
|
||||
if (ret) {
|
||||
unuse_block_rsv(root->fs_info, block_rsv, blocksize);
|
||||
return ERR_PTR(ret);
|
||||
|
|
|
@ -634,8 +634,7 @@ static noinline int submit_compressed_extents(struct inode *inode,
|
|||
ret = btrfs_reserve_extent(trans, root,
|
||||
async_extent->compressed_size,
|
||||
async_extent->compressed_size,
|
||||
0, alloc_hint,
|
||||
(u64)-1, &ins, 1);
|
||||
0, alloc_hint, &ins, 1);
|
||||
btrfs_end_transaction(trans, root);
|
||||
|
||||
if (ret) {
|
||||
|
@ -838,7 +837,7 @@ static noinline int cow_file_range(struct inode *inode,
|
|||
cur_alloc_size = disk_num_bytes;
|
||||
ret = btrfs_reserve_extent(trans, root, cur_alloc_size,
|
||||
root->sectorsize, 0, alloc_hint,
|
||||
(u64)-1, &ins, 1);
|
||||
&ins, 1);
|
||||
BUG_ON(ret);
|
||||
|
||||
em = alloc_extent_map();
|
||||
|
@ -5414,7 +5413,7 @@ static struct extent_map *btrfs_new_extent_direct(struct inode *inode,
|
|||
|
||||
alloc_hint = get_extent_allocation_hint(inode, start, len);
|
||||
ret = btrfs_reserve_extent(trans, root, len, root->sectorsize, 0,
|
||||
alloc_hint, (u64)-1, &ins, 1);
|
||||
alloc_hint, &ins, 1);
|
||||
if (ret) {
|
||||
em = ERR_PTR(ret);
|
||||
goto out;
|
||||
|
@ -7315,7 +7314,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
|
|||
}
|
||||
|
||||
ret = btrfs_reserve_extent(trans, root, num_bytes, min_size,
|
||||
0, *alloc_hint, (u64)-1, &ins, 1);
|
||||
0, *alloc_hint, &ins, 1);
|
||||
if (ret) {
|
||||
if (own_trans)
|
||||
btrfs_end_transaction(trans, root);
|
||||
|
|
Loading…
Reference in a new issue