Commit 2f6e05a5 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: remove fs_info parameter from btrfs_destroy_delayed_refs() 



The fs_info parameter is redundant because it can be extracted from the
transaction given as another parameter. So remove it and use the fs_info
accessible from the transaction.

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 22a0ae18

fs/btrfs/delayed-ref.c

+2 −2
Original line number Diff line number Diff line
@@ -1239,11 +1239,11 @@ bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head, 
	return found;

}



void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,

				struct btrfs_fs_info *fs_info)

void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans)

{

	struct rb_node *node;

	struct btrfs_delayed_ref_root *delayed_refs = &trans->delayed_refs;

	struct btrfs_fs_info *fs_info = trans->fs_info;



	spin_lock(&delayed_refs->lock);

	while ((node = rb_first_cached(&delayed_refs->href_root)) != NULL) {

fs/btrfs/delayed-ref.h

+1 −2
Original line number Diff line number Diff line
@@ -399,8 +399,7 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info, 
bool btrfs_check_space_for_delayed_refs(struct btrfs_fs_info *fs_info);

bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,

				 u64 root, u64 parent);

void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,

				struct btrfs_fs_info *fs_info);

void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans);



static inline u64 btrfs_delayed_ref_owner(struct btrfs_delayed_ref_node *node)

{

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -4748,7 +4748,7 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans, 
		list_del_init(&dev->post_commit_list);

	}



	btrfs_destroy_delayed_refs(cur_trans, fs_info);

	btrfs_destroy_delayed_refs(cur_trans);



	cur_trans->state = TRANS_STATE_COMMIT_START;

	wake_up(&fs_info->transaction_blocked_wait);