Commit 8c7cd2b6 authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop unused parameter fs_info from btrfs_match_dir_item_name() 



Cascaded removal of fs_info that is not needed in several functions.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d12a1a2a

fs/btrfs/dir-item.c

+4 −7
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle 
						   const char *name,

						   int name_len)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	int ret;

	char *ptr;

	struct extent_buffer *leaf;
@@ -35,7 +34,7 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle 
	ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size);

	if (ret == -EEXIST) {

		struct btrfs_dir_item *di;

		di = btrfs_match_dir_item_name(fs_info, path, name, name_len);

		di = btrfs_match_dir_item_name(path, name, name_len);

		if (di)

			return ERR_PTR(-EEXIST);

		btrfs_extend_item(trans, path, data_size);
@@ -190,7 +189,7 @@ static struct btrfs_dir_item *btrfs_lookup_match_dir( 
	if (ret > 0)

		return ERR_PTR(-ENOENT);



	return btrfs_match_dir_item_name(root->fs_info, path, name, name_len);

	return btrfs_match_dir_item_name(path, name, name_len);

}



/*
@@ -341,8 +340,7 @@ btrfs_search_dir_index_item(struct btrfs_root *root, struct btrfs_path *path, 
		if (key.objectid != dirid || key.type != BTRFS_DIR_INDEX_KEY)

			break;



		di = btrfs_match_dir_item_name(root->fs_info, path,

					       name->name, name->len);

		di = btrfs_match_dir_item_name(path, name->name, name->len);

		if (di)

			return di;

	}
@@ -378,8 +376,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, 
 * this walks through all the entries in a dir item and finds one

 * for a specific name.

 */

struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,

						 const struct btrfs_path *path,

struct btrfs_dir_item *btrfs_match_dir_item_name(const struct btrfs_path *path,

						 const char *name, int name_len)

{

	struct btrfs_dir_item *dir_item;

fs/btrfs/dir-item.h

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, 
					  struct btrfs_path *path, u64 dir,

					  const char *name, u16 name_len,

					  int mod);

struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,

						 const struct btrfs_path *path,

struct btrfs_dir_item *btrfs_match_dir_item_name(const struct btrfs_path *path,

						 const char *name,

						 int name_len);

fs/btrfs/send.c

+1 −2
Original line number Diff line number Diff line
@@ -3760,7 +3760,6 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx, 
				  struct recorded_ref *parent_ref,

				  const bool is_orphan)

{

	struct btrfs_fs_info *fs_info = sctx->parent_root->fs_info;

	struct btrfs_path *path;

	struct btrfs_key key;

	struct btrfs_key di_key;
@@ -3789,7 +3788,7 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx, 
		goto out;

	}



	di = btrfs_match_dir_item_name(fs_info, path, parent_ref->name,

	di = btrfs_match_dir_item_name(path, parent_ref->name,

				       parent_ref->name_len);

	if (!di) {

		ret = 0;

fs/btrfs/xattr.c

+2 −3
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode, 
{

	struct btrfs_dir_item *di = NULL;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_path *path;

	size_t name_len = strlen(name);

	int ret = 0;
@@ -143,14 +142,14 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode, 
		 */

		ret = 0;

		btrfs_assert_tree_write_locked(path->nodes[0]);

		di = btrfs_match_dir_item_name(fs_info, path, name, name_len);

		di = btrfs_match_dir_item_name(path, name, name_len);

		if (!di && !(flags & XATTR_REPLACE)) {

			ret = -ENOSPC;

			goto out;

		}

	} else if (ret == -EEXIST) {

		ret = 0;

		di = btrfs_match_dir_item_name(fs_info, path, name, name_len);

		di = btrfs_match_dir_item_name(path, name, name_len);

		ASSERT(di); /* logic error */

	} else if (ret) {

		goto out;