Commit 9798ba24 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: remove root argument from drop_one_dir_item() 



The root argument for drop_one_dir_item() always matches the root of the
given directory inode, since each log tree is associated to one and only
one subvolume/root, so remove the argument.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5d03dbeb

fs/btrfs/tree-log.c

+4 −4
Original line number Diff line number Diff line
@@ -921,11 +921,11 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, 
 * item

 */

static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,

				      struct btrfs_root *root,

				      struct btrfs_path *path,

				      struct btrfs_inode *dir,

				      struct btrfs_dir_item *di)

{

	struct btrfs_root *root = dir->root;

	struct inode *inode;

	char *name;

	int name_len;
@@ -1220,7 +1220,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, 
	if (IS_ERR(di)) {

		return PTR_ERR(di);

	} else if (di) {

		ret = drop_one_dir_item(trans, root, path, dir, di);

		ret = drop_one_dir_item(trans, path, dir, di);

		if (ret)

			return ret;

	}
@@ -1232,7 +1232,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, 
	if (IS_ERR(di)) {

		return PTR_ERR(di);

	} else if (di) {

		ret = drop_one_dir_item(trans, root, path, dir, di);

		ret = drop_one_dir_item(trans, path, dir, di);

		if (ret)

			return ret;

	}
@@ -2049,7 +2049,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, 
	if (!exists)

		goto out;



	ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), dst_di);

	ret = drop_one_dir_item(trans, path, BTRFS_I(dir), dst_di);

	if (ret)

		goto out;