Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be97f133 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Drop fs_info parameter from btrfs_merge_delayed_refs 



It's provided by the transaction handle.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f033798d

fs/btrfs/delayed-ref.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -286,10 +286,10 @@ static bool merge_ref(struct btrfs_trans_handle *trans, 
}

}





void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,

void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,

			      struct btrfs_fs_info *fs_info,

			      struct btrfs_delayed_ref_root *delayed_refs,

			      struct btrfs_delayed_ref_root *delayed_refs,

			      struct btrfs_delayed_ref_head *head)

			      struct btrfs_delayed_ref_head *head)

{

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_delayed_ref_node *ref;

	struct btrfs_delayed_ref_node *ref;

	struct rb_node *node;

	struct rb_node *node;

	u64 seq = 0;

	u64 seq = 0;

fs/btrfs/delayed-ref.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -251,7 +251,6 @@ int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info, 
				u64 bytenr, u64 num_bytes,

				u64 bytenr, u64 num_bytes,

				struct btrfs_delayed_extent_op *extent_op);

				struct btrfs_delayed_extent_op *extent_op);

void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,

void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,

			      struct btrfs_fs_info *fs_info,

			      struct btrfs_delayed_ref_root *delayed_refs,

			      struct btrfs_delayed_ref_root *delayed_refs,

			      struct btrfs_delayed_ref_head *head);

			      struct btrfs_delayed_ref_head *head);

fs/btrfs/extent-tree.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2703,8 +2703,7 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, 
		 * insert_inline_extent_backref()).

		 * insert_inline_extent_backref()).

		 */

		 */

		spin_lock(&locked_ref->lock);

		spin_lock(&locked_ref->lock);

		btrfs_merge_delayed_refs(trans, fs_info, delayed_refs,

		btrfs_merge_delayed_refs(trans, delayed_refs, locked_ref);

					 locked_ref);





		/*

		/*

		 * locked_ref is the head node, so we have to go one

		 * locked_ref is the head node, so we have to go one