Skip to content

Commit a0d7e98

Browse files
committed
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 <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 849c01a commit a0d7e98

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

fs/btrfs/delayed-inode.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,24 +1682,24 @@ int btrfs_inode_delayed_dir_index_count(struct btrfs_inode *inode)
16821682
return 0;
16831683
}
16841684

1685-
bool btrfs_readdir_get_delayed_items(struct inode *inode,
1685+
bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode,
16861686
u64 last_index,
16871687
struct list_head *ins_list,
16881688
struct list_head *del_list)
16891689
{
16901690
struct btrfs_delayed_node *delayed_node;
16911691
struct btrfs_delayed_item *item;
16921692

1693-
delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
1693+
delayed_node = btrfs_get_delayed_node(inode);
16941694
if (!delayed_node)
16951695
return false;
16961696

16971697
/*
16981698
* We can only do one readdir with delayed items at a time because of
16991699
* item->readdir_list.
17001700
*/
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);
17031703

17041704
mutex_lock(&delayed_node->mutex);
17051705
item = __btrfs_first_delayed_insertion_item(delayed_node);

fs/btrfs/delayed-inode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root);
143143
void btrfs_destroy_delayed_inodes(struct btrfs_fs_info *fs_info);
144144

145145
/* Used for readdir() */
146-
bool btrfs_readdir_get_delayed_items(struct inode *inode,
146+
bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode,
147147
u64 last_index,
148148
struct list_head *ins_list,
149149
struct list_head *del_list);

fs/btrfs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5947,7 +5947,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
59475947
addr = private->filldir_buf;
59485948
path->reada = READA_FORWARD;
59495949

5950-
put = btrfs_readdir_get_delayed_items(inode, private->last_index,
5950+
put = btrfs_readdir_get_delayed_items(BTRFS_I(inode), private->last_index,
59515951
&ins_list, &del_list);
59525952

59535953
again:

0 commit comments

Comments
 (0)