Skip to content

Commit 849c01a

Browse files
committed
btrfs: pass a btrfs_inode to btrfs_readdir_put_delayed_items()
Pass a struct btrfs_inode to btrfs_readdir_put_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 2422547 commit 849c01a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

fs/btrfs/delayed-inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode,
17301730
return true;
17311731
}
17321732

1733-
void btrfs_readdir_put_delayed_items(struct inode *inode,
1733+
void btrfs_readdir_put_delayed_items(struct btrfs_inode *inode,
17341734
struct list_head *ins_list,
17351735
struct list_head *del_list)
17361736
{
@@ -1752,7 +1752,7 @@ void btrfs_readdir_put_delayed_items(struct inode *inode,
17521752
* The VFS is going to do up_read(), so we need to downgrade back to a
17531753
* read lock.
17541754
*/
1755-
downgrade_write(&inode->i_rwsem);
1755+
downgrade_write(&inode->vfs_inode.i_rwsem);
17561756
}
17571757

17581758
int btrfs_should_delete_dir_index(const struct list_head *del_list,

fs/btrfs/delayed-inode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode,
147147
u64 last_index,
148148
struct list_head *ins_list,
149149
struct list_head *del_list);
150-
void btrfs_readdir_put_delayed_items(struct inode *inode,
150+
void btrfs_readdir_put_delayed_items(struct btrfs_inode *inode,
151151
struct list_head *ins_list,
152152
struct list_head *del_list);
153153
int btrfs_should_delete_dir_index(const struct list_head *del_list,

fs/btrfs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6037,7 +6037,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
60376037
ret = 0;
60386038
err:
60396039
if (put)
6040-
btrfs_readdir_put_delayed_items(inode, &ins_list, &del_list);
6040+
btrfs_readdir_put_delayed_items(BTRFS_I(inode), &ins_list, &del_list);
60416041
btrfs_free_path(path);
60426042
return ret;
60436043
}

0 commit comments

Comments
 (0)