mirror of
https://github.com/torvalds/linux.git
synced 2026-11-10 17:11:02 +01:00
btrfs: remove fs_info argument from btrfs_block_rsv_add()
The fs_info argument is not used, so remove it. Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
08f750d9f8
commit
2f19d4a02c
|
|
@ -4613,9 +4613,8 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
|
|||
if (ret && need_system_chunk)
|
||||
return;
|
||||
|
||||
ret = btrfs_block_rsv_add(fs_info,
|
||||
&fs_info->chunk_block_rsv,
|
||||
bytes, BTRFS_RESERVE_NO_FLUSH);
|
||||
ret = btrfs_block_rsv_add(&fs_info->chunk_block_rsv, bytes,
|
||||
BTRFS_RESERVE_NO_FLUSH);
|
||||
if (!ret)
|
||||
trans->chunk_bytes_reserved += bytes;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -209,8 +209,7 @@ void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,
|
|||
kfree(rsv);
|
||||
}
|
||||
|
||||
int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
int btrfs_block_rsv_add(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
enum btrfs_reserve_flush_enum flush)
|
||||
{
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -69,8 +69,7 @@ void btrfs_init_metadata_block_rsv(struct btrfs_fs_info *fs_info,
|
|||
enum btrfs_rsv_type type);
|
||||
void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_block_rsv *rsv);
|
||||
int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
int btrfs_block_rsv_add(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
enum btrfs_reserve_flush_enum flush);
|
||||
int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_percent);
|
||||
int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,
|
||||
|
|
|
|||
|
|
@ -600,8 +600,7 @@ static int btrfs_delayed_inode_reserve_metadata(
|
|||
ret = btrfs_qgroup_reserve_meta_prealloc(root, num_bytes, true, true);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
ret = btrfs_block_rsv_add(fs_info, dst_rsv, num_bytes,
|
||||
BTRFS_RESERVE_NO_FLUSH);
|
||||
ret = btrfs_block_rsv_add(dst_rsv, num_bytes, BTRFS_RESERVE_NO_FLUSH);
|
||||
/* NO_FLUSH could only fail with -ENOSPC */
|
||||
ASSERT(ret == 0 || ret == -ENOSPC);
|
||||
if (ret)
|
||||
|
|
|
|||
|
|
@ -440,8 +440,7 @@ int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,
|
|||
*/
|
||||
if (need_reserve) {
|
||||
num_bytes = btrfs_calc_insert_metadata_size(fs_info, 1);
|
||||
ret = btrfs_block_rsv_add(fs_info, trans->block_rsv,
|
||||
num_bytes,
|
||||
ret = btrfs_block_rsv_add(trans->block_rsv, num_bytes,
|
||||
BTRFS_RESERVE_NO_FLUSH);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -1795,7 +1795,7 @@ int prepare_to_merge(struct reloc_control *rc, int err)
|
|||
again:
|
||||
if (!err) {
|
||||
num_bytes = rc->merging_rsv_size;
|
||||
ret = btrfs_block_rsv_add(fs_info, rc->block_rsv, num_bytes,
|
||||
ret = btrfs_block_rsv_add(rc->block_rsv, num_bytes,
|
||||
BTRFS_RESERVE_FLUSH_ALL);
|
||||
if (ret)
|
||||
err = ret;
|
||||
|
|
|
|||
|
|
@ -510,8 +510,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
|
|||
num_bytes = btrfs_calc_insert_metadata_size(fs_info, items);
|
||||
rsv->space_info = btrfs_find_space_info(fs_info,
|
||||
BTRFS_BLOCK_GROUP_METADATA);
|
||||
ret = btrfs_block_rsv_add(fs_info, rsv, num_bytes,
|
||||
BTRFS_RESERVE_FLUSH_ALL);
|
||||
ret = btrfs_block_rsv_add(rsv, num_bytes, BTRFS_RESERVE_FLUSH_ALL);
|
||||
|
||||
if (ret == -ENOSPC && use_global_rsv)
|
||||
ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes, true);
|
||||
|
|
|
|||
|
|
@ -1767,8 +1767,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
|
|||
btrfs_reloc_pre_snapshot(pending, &to_reserve);
|
||||
|
||||
if (to_reserve > 0) {
|
||||
pending->error = btrfs_block_rsv_add(fs_info,
|
||||
&pending->block_rsv,
|
||||
pending->error = btrfs_block_rsv_add(&pending->block_rsv,
|
||||
to_reserve,
|
||||
BTRFS_RESERVE_NO_FLUSH);
|
||||
if (unlikely(pending->error))
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user