Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -6
+4 -4
fs/btrfs/delayed-inode.c
··· 1682 1682 return 0; 1683 1683 } 1684 1684 1685 - bool btrfs_readdir_get_delayed_items(struct inode *inode, 1685 + bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode, 1686 1686 u64 last_index, 1687 1687 struct list_head *ins_list, 1688 1688 struct list_head *del_list) ··· 1690 1690 struct btrfs_delayed_node *delayed_node; 1691 1691 struct btrfs_delayed_item *item; 1692 1692 1693 - delayed_node = btrfs_get_delayed_node(BTRFS_I(inode)); 1693 + delayed_node = btrfs_get_delayed_node(inode); 1694 1694 if (!delayed_node) 1695 1695 return false; 1696 1696 ··· 1698 1698 * We can only do one readdir with delayed items at a time because of 1699 1699 * item->readdir_list. 1700 1700 */ 1701 - btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_SHARED); 1702 - btrfs_inode_lock(BTRFS_I(inode), 0); 1701 + btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED); 1702 + btrfs_inode_lock(inode, 0); 1703 1703 1704 1704 mutex_lock(&delayed_node->mutex); 1705 1705 item = __btrfs_first_delayed_insertion_item(delayed_node);
+1 -1
fs/btrfs/delayed-inode.h
··· 143 143 void btrfs_destroy_delayed_inodes(struct btrfs_fs_info *fs_info); 144 144 145 145 /* Used for readdir() */ 146 - bool btrfs_readdir_get_delayed_items(struct inode *inode, 146 + bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode, 147 147 u64 last_index, 148 148 struct list_head *ins_list, 149 149 struct list_head *del_list);
+1 -1
fs/btrfs/inode.c
··· 5947 5947 addr = private->filldir_buf; 5948 5948 path->reada = READA_FORWARD; 5949 5949 5950 - put = btrfs_readdir_get_delayed_items(inode, private->last_index, 5950 + put = btrfs_readdir_get_delayed_items(BTRFS_I(inode), private->last_index, 5951 5951 &ins_list, &del_list); 5952 5952 5953 5953 again: