Commit df492881 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: remove root argument from btrfs_delayed_item_reserve_metadata()

The root argument of btrfs_delayed_item_reserve_metadata() is used only
to get the fs_info object, but we already have a transaction handle, which
we can use to get the fs_info. So remove the root argument.
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 009d9bea
...@@ -520,12 +520,11 @@ static struct btrfs_delayed_item *__btrfs_next_delayed_item( ...@@ -520,12 +520,11 @@ static struct btrfs_delayed_item *__btrfs_next_delayed_item(
} }
static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans, static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct btrfs_delayed_item *item) struct btrfs_delayed_item *item)
{ {
struct btrfs_block_rsv *src_rsv; struct btrfs_block_rsv *src_rsv;
struct btrfs_block_rsv *dst_rsv; struct btrfs_block_rsv *dst_rsv;
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = trans->fs_info;
u64 num_bytes; u64 num_bytes;
int ret; int ret;
...@@ -1490,8 +1489,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, ...@@ -1490,8 +1489,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
} }
if (reserve_leaf_space) { if (reserve_leaf_space) {
ret = btrfs_delayed_item_reserve_metadata(trans, dir->root, ret = btrfs_delayed_item_reserve_metadata(trans, delayed_item);
delayed_item);
/* /*
* Space was reserved for a dir index item insertion when we * Space was reserved for a dir index item insertion when we
* started the transaction, so getting a failure here should be * started the transaction, so getting a failure here should be
...@@ -1614,7 +1612,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, ...@@ -1614,7 +1612,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,
item->key = item_key; item->key = item_key;
item->ins_or_del = BTRFS_DELAYED_DELETION_ITEM; item->ins_or_del = BTRFS_DELAYED_DELETION_ITEM;
ret = btrfs_delayed_item_reserve_metadata(trans, dir->root, item); ret = btrfs_delayed_item_reserve_metadata(trans, item);
/* /*
* we have reserved enough space when we start a new transaction, * we have reserved enough space when we start a new transaction,
* so reserving metadata failure is impossible. * so reserving metadata failure is impossible.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment