btrfs: pass a btrfs_inode to btrfs_readdir_get_delayed_items()

Pass a struct btrfs_inode to btrfs_readdir_get_delayed_items() as it's
an internal interface, allowing to remove some use of BTRFS_I.

Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 3a1b6e1209594e9558e504e385c5163da9d19d51..508bdbae29a0a95f5ddec84ede9ea02574945bec 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1682,7 +1682,7 @@ int btrfs_inode_delayed_dir_index_count(struct btrfs_inode *inode)
        return 0;
 }
 
-bool btrfs_readdir_get_delayed_items(struct inode *inode,
+bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode,
                                     u64 last_index,
                                     struct list_head *ins_list,
                                     struct list_head *del_list)
@@ -1690,7 +1690,7 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode,
        struct btrfs_delayed_node *delayed_node;
        struct btrfs_delayed_item *item;
 
-       delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
+       delayed_node = btrfs_get_delayed_node(inode);
        if (!delayed_node)
                return false;
 
@@ -1698,8 +1698,8 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode,
         * We can only do one readdir with delayed items at a time because of
         * item->readdir_list.
         */
-       btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_SHARED);
-       btrfs_inode_lock(BTRFS_I(inode), 0);
+       btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);
+       btrfs_inode_lock(inode, 0);
 
        mutex_lock(&delayed_node->mutex);
        item = __btrfs_first_delayed_insertion_item(delayed_node);

diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
index e30ba7962d448c45ef6c9475237e72ab4f3d7c08..7cfefdfe54ea675854b3e4de0b72e624ab2d58ce 100644 (file)
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
@@ -143,7 +143,7 @@ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root);
 void btrfs_destroy_delayed_inodes(struct btrfs_fs_info *fs_info);
 
 /* Used for readdir() */
-bool btrfs_readdir_get_delayed_items(struct inode *inode,
+bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode,
                                     u64 last_index,
                                     struct list_head *ins_list,
                                     struct list_head *del_list);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 85e29f626a4bcf45e6291e9e1e3cd77415cbdd4a..dfbb907430262e94ca82e3344d548adb89a01e8d 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5947,7 +5947,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
        addr = private->filldir_buf;
        path->reada = READA_FORWARD;
 
-       put = btrfs_readdir_get_delayed_items(inode, private->last_index,
+       put = btrfs_readdir_get_delayed_items(BTRFS_I(inode), private->last_index,
                                              &ins_list, &del_list);
 
 again: