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

Commit 684572df authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: Remove root parameter from btrfs_insert_dir_item 



All callers pass the root tree of dir, we can push that down to the
function itself.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3a584174

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -3021,8 +3021,7 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info, 
/* dir-item.c */

int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,

			  const char *name, int name_len);

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root, const char *name,

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name,

			  int name_len, struct btrfs_inode *dir,

			  struct btrfs_key *location, u8 type, u64 index);

struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,

fs/btrfs/dir-item.c

+4 −4
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans, 
 * to use for the second index (if one is created).

 * Will return 0 or -ENOMEM

 */

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root

			  *root, const char *name, int name_len,

			  struct btrfs_inode *dir, struct btrfs_key *location,

			  u8 type, u64 index)

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name,

			  int name_len, struct btrfs_inode *dir,

			  struct btrfs_key *location, u8 type, u64 index)

{

	int ret = 0;

	int ret2 = 0;

	struct btrfs_root *root = dir->root;

	struct btrfs_path *path;

	struct btrfs_dir_item *dir_item;

	struct extent_buffer *leaf;

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -6389,8 +6389,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, 
	if (ret)

		return ret;



	ret = btrfs_insert_dir_item(trans, root, name, name_len,

				    parent_inode, &key,

	ret = btrfs_insert_dir_item(trans, name, name_len, parent_inode, &key,

				    btrfs_inode_type(&inode->vfs_inode), index);

	if (ret == -EEXIST || ret == -EOVERFLOW)

		goto fail_dir_item;

fs/btrfs/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -686,8 +686,7 @@ static noinline int create_subvol(struct inode *dir, 
		goto fail;

	}



	ret = btrfs_insert_dir_item(trans, root,

				    name, namelen, BTRFS_I(dir), &key,

	ret = btrfs_insert_dir_item(trans, name, namelen, BTRFS_I(dir), &key,

				    BTRFS_FT_DIR, index);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

fs/btrfs/transaction.c

+3 −4
Original line number Diff line number Diff line
@@ -1613,10 +1613,9 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
	if (ret < 0)

		goto fail;



	ret = btrfs_insert_dir_item(trans, parent_root,

				    dentry->d_name.name, dentry->d_name.len,

				    BTRFS_I(parent_inode), &key,

				    BTRFS_FT_DIR, index);

	ret = btrfs_insert_dir_item(trans, dentry->d_name.name,

				    dentry->d_name.len, BTRFS_I(parent_inode),

				    &key, BTRFS_FT_DIR, index);

	/* We have check then name at the beginning, so it is impossible. */

	BUG_ON(ret == -EEXIST || ret == -EOVERFLOW);

	if (ret) {