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: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 7c900eb27cf8b7105721e3fc911a302d192e19c6..23f1a35ea04f019b5e0ca7363b7f5e44217169e4 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -921,11 +921,11 @@ out:
  * 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 @@ next:
        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 @@ next:
        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;