btrfs: remove root argument from btrfs_del_dir_entries_in_log()

There's no need to pass the root as we can extract it from the directory
inode, so remove it.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
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/inode.c b/fs/btrfs/inode.c
index 8e13117eca161543fb2565c74afde9446d0da40b..554bd03c9f2169136da57a60b695db64540d17c4 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4363,7 +4363,7 @@ skip_backref:
         */
        if (!rename_ctx) {
                btrfs_del_inode_ref_in_log(trans, root, name, inode, dir_ino);
-               btrfs_del_dir_entries_in_log(trans, root, name, dir, index);
+               btrfs_del_dir_entries_in_log(trans, name, dir, index);
        }
 
        /*

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index cc27f87c4904f1703e4230da72df5026b7c8d84c..c2e45e64ab6c2a2be2f0d30c009a8fa9a608df9c 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3900,10 +3900,10 @@ static int del_logged_dentry(struct btrfs_trans_handle *trans,
  * or the entire directory.
  */
 void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
-                                 struct btrfs_root *root,
                                  const struct fscrypt_str *name,
                                  struct btrfs_inode *dir, u64 index)
 {
+       struct btrfs_root *root = dir->root;
        BTRFS_PATH_AUTO_FREE(path);
        int ret;
 

diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index 4f149d7d4fdee13deb929fd2f30c0ca57f80d49c..a0aeec2448c0f467b7ecd0f8a125ce44824cb0cf 100644 (file)
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -79,7 +79,6 @@ int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans,
                          struct dentry *dentry,
                          struct btrfs_log_ctx *ctx);
 void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
-                                 struct btrfs_root *root,
                                  const struct fscrypt_str *name,
                                  struct btrfs_inode *dir, u64 index);
 void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,