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

Commit fef394f7 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

btrfs: drop unused extent_op arg from btrfs_add_delayed_data_ref 



btrfs_add_delayed_data_ref is always called with a NULL extent_op,
so let's drop the argument.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 694a0dee

fs/btrfs/delayed-ref.c

+2 −4
Original line number Diff line number Diff line
@@ -829,15 +829,13 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info, 
			       struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes,

			       u64 parent, u64 ref_root,

			       u64 owner, u64 offset, u64 reserved, int action,

			       struct btrfs_delayed_extent_op *extent_op)

			       u64 owner, u64 offset, u64 reserved, int action)

{

	struct btrfs_delayed_data_ref *ref;

	struct btrfs_delayed_ref_head *head_ref;

	struct btrfs_delayed_ref_root *delayed_refs;

	struct btrfs_qgroup_extent_record *record = NULL;



	BUG_ON(extent_op && !extent_op->is_data);

	ref = kmem_cache_alloc(btrfs_delayed_data_ref_cachep, GFP_NOFS);

	if (!ref)

		return -ENOMEM;
@@ -859,7 +857,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info, 
		}

	}



	head_ref->extent_op = extent_op;

	head_ref->extent_op = NULL;



	delayed_refs = &trans->transaction->delayed_refs;

	spin_lock(&delayed_refs->lock);

fs/btrfs/delayed-ref.h

+1 −2
Original line number Diff line number Diff line
@@ -250,8 +250,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info, 
			       struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes,

			       u64 parent, u64 ref_root,

			       u64 owner, u64 offset, u64 reserved, int action,

			       struct btrfs_delayed_extent_op *extent_op);

			       u64 owner, u64 offset, u64 reserved, int action);

int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info,

				struct btrfs_trans_handle *trans,

				u64 bytenr, u64 num_bytes,

fs/btrfs/extent-tree.c

+3 −4
Original line number Diff line number Diff line
@@ -2089,7 +2089,7 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
		ret = btrfs_add_delayed_data_ref(fs_info, trans, bytenr,

					num_bytes, parent, root_objectid,

					owner, offset, 0,

					BTRFS_ADD_DELAYED_REF, NULL);

					BTRFS_ADD_DELAYED_REF);

	}

	return ret;

}
@@ -7244,7 +7244,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, 
						num_bytes,

						parent, root_objectid, owner,

						offset, 0,

						BTRFS_DROP_DELAYED_REF, NULL);

						BTRFS_DROP_DELAYED_REF);

	}

	return ret;

}
@@ -8194,8 +8194,7 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
	ret = btrfs_add_delayed_data_ref(fs_info, trans, ins->objectid,

					 ins->offset, 0,

					 root_objectid, owner, offset,

					 ram_bytes, BTRFS_ADD_DELAYED_EXTENT,

					 NULL);

					 ram_bytes, BTRFS_ADD_DELAYED_EXTENT);

	return ret;

}