mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
btrfs: remove fs_info argument from btrfs_block_rsv_refill()
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
2f19d4a02c
commit
dec07422bc
|
|
@ -238,8 +238,7 @@ int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_percent)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
int btrfs_block_rsv_refill(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
enum btrfs_reserve_flush_enum flush)
|
||||
{
|
||||
int ret = -ENOSPC;
|
||||
|
|
|
|||
|
|
@ -72,8 +72,7 @@ void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,
|
|||
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,
|
||||
struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
int btrfs_block_rsv_refill(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
|
||||
enum btrfs_reserve_flush_enum flush);
|
||||
int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,
|
||||
struct btrfs_block_rsv *dst_rsv, u64 num_bytes,
|
||||
|
|
|
|||
|
|
@ -5595,10 +5595,10 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root,
|
|||
* if we fail to make this reservation we can re-try without the
|
||||
* delayed_refs_extra so we can make some forward progress.
|
||||
*/
|
||||
ret = btrfs_block_rsv_refill(fs_info, rsv, rsv->size + delayed_refs_extra,
|
||||
ret = btrfs_block_rsv_refill(rsv, rsv->size + delayed_refs_extra,
|
||||
BTRFS_RESERVE_FLUSH_EVICT);
|
||||
if (ret) {
|
||||
ret = btrfs_block_rsv_refill(fs_info, rsv, rsv->size,
|
||||
ret = btrfs_block_rsv_refill(rsv, rsv->size,
|
||||
BTRFS_RESERVE_FLUSH_EVICT);
|
||||
if (ret) {
|
||||
btrfs_warn(fs_info,
|
||||
|
|
|
|||
|
|
@ -1675,8 +1675,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,
|
|||
memset(&next_key, 0, sizeof(next_key));
|
||||
|
||||
while (1) {
|
||||
ret = btrfs_block_rsv_refill(fs_info, rc->block_rsv,
|
||||
min_reserved,
|
||||
ret = btrfs_block_rsv_refill(rc->block_rsv, min_reserved,
|
||||
BTRFS_RESERVE_FLUSH_LIMIT);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
|
@ -2274,7 +2273,7 @@ static int refill_metadata_space(struct btrfs_trans_handle *trans,
|
|||
* If we get an enospc just kick back -EAGAIN so we know to drop the
|
||||
* transaction and try to refill when we can flush all the things.
|
||||
*/
|
||||
ret = btrfs_block_rsv_refill(fs_info, rc->block_rsv, num_bytes,
|
||||
ret = btrfs_block_rsv_refill(rc->block_rsv, num_bytes,
|
||||
BTRFS_RESERVE_FLUSH_LIMIT);
|
||||
if (ret) {
|
||||
u64 tmp = fs_info->nodesize * RELOCATION_RESERVED_NODES;
|
||||
|
|
@ -3584,8 +3583,7 @@ int prepare_to_relocate(struct reloc_control *rc)
|
|||
rc->reserved_bytes = 0;
|
||||
rc->block_rsv->size = rc->extent_root->fs_info->nodesize *
|
||||
RELOCATION_RESERVED_NODES;
|
||||
ret = btrfs_block_rsv_refill(rc->extent_root->fs_info,
|
||||
rc->block_rsv, rc->block_rsv->size,
|
||||
ret = btrfs_block_rsv_refill(rc->block_rsv, rc->block_rsv->size,
|
||||
BTRFS_RESERVE_FLUSH_ALL);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
@ -3637,8 +3635,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
|
|||
|
||||
while (1) {
|
||||
rc->reserved_bytes = 0;
|
||||
ret = btrfs_block_rsv_refill(fs_info, rc->block_rsv,
|
||||
rc->block_rsv->size,
|
||||
ret = btrfs_block_rsv_refill(rc->block_rsv, rc->block_rsv->size,
|
||||
BTRFS_RESERVE_FLUSH_ALL);
|
||||
if (ret) {
|
||||
err = ret;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user