Commit f09f7851 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

btrfs: remove trans parameter of merge_ref 



Now that drop_delayed_ref() doesn't get the btrfs_trans_handle passed in
anymore, we can get rid of it in merge_ref() as well.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4c89493f

fs/btrfs/delayed-ref.c

+2 −3
Original line number Diff line number Diff line
@@ -451,8 +451,7 @@ static inline void drop_delayed_ref(struct btrfs_delayed_ref_root *delayed_refs, 
	atomic_dec(&delayed_refs->num_entries);

}



static bool merge_ref(struct btrfs_trans_handle *trans,

		      struct btrfs_delayed_ref_root *delayed_refs,

static bool merge_ref(struct btrfs_delayed_ref_root *delayed_refs,

		      struct btrfs_delayed_ref_head *head,

		      struct btrfs_delayed_ref_node *ref,

		      u64 seq)
@@ -523,7 +522,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, 
		ref = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);

		if (seq && ref->seq >= seq)

			continue;

		if (merge_ref(trans, delayed_refs, head, ref, seq))

		if (merge_ref(delayed_refs, head, ref, seq))

			goto again;

	}

}