btrfs: Remove fs_info from btrfs_insert_delayed_dir_index

It can be referenced from the passed transaction handle.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 596d2af..5d103ed 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1418,7 +1418,6 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info)
 
 /* Will return 0 or -ENOMEM */
 int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
-                                  struct btrfs_fs_info *fs_info,
                                   const char *name, int name_len,
                                   struct btrfs_inode *dir,
                                   struct btrfs_disk_key *disk_key, u8 type,
@@ -1458,11 +1457,10 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
         */
        BUG_ON(ret);
 
-
        mutex_lock(&delayed_node->mutex);
        ret = __btrfs_add_delayed_insertion_item(delayed_node, delayed_item);
        if (unlikely(ret)) {
-               btrfs_err(fs_info,
+               btrfs_err(trans->fs_info,
                          "err add delayed dir index item(name: %.*s) into the insertion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",
                          name_len, name, delayed_node->root->objectid,
                          delayed_node->inode_id, ret);

diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
index ca7a97f..44558ed 100644 (file)
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
@@ -86,7 +86,6 @@ static inline void btrfs_init_delayed_root(
 }
 
 int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
-                                  struct btrfs_fs_info *fs_info,
                                   const char *name, int name_len,
                                   struct btrfs_inode *dir,
                                   struct btrfs_disk_key *disk_key, u8 type,

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 39e9766..a678b07 100644 (file)
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -160,8 +160,8 @@ second_insert:
        }
        btrfs_release_path(path);
 
-       ret2 = btrfs_insert_delayed_dir_index(trans, root->fs_info, name,
-                       name_len, dir, &disk_key, type, index);
+       ret2 = btrfs_insert_delayed_dir_index(trans, name, name_len, dir,
+                                             &disk_key, type, index);
 out_free:
        btrfs_free_path(path);
        if (ret)