Commit bd54766e authored by David Sterba's avatar David Sterba
Browse files

btrfs: pass btrfs_inode to btrfs_clear_delalloc_extent 



The function is for internal interfaces so we should use the
btrfs_inode.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 62798a49

fs/btrfs/btrfs_inode.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ struct inode *btrfs_new_subvol_inode(struct user_namespace *mnt_userns, 
				     struct inode *dir);

 void btrfs_set_delalloc_extent(struct btrfs_inode *inode, struct extent_state *state,

			        u32 bits);

void btrfs_clear_delalloc_extent(struct inode *inode,

void btrfs_clear_delalloc_extent(struct btrfs_inode *inode,

				 struct extent_state *state, u32 bits);

void btrfs_merge_delalloc_extent(struct btrfs_inode *inode, struct extent_state *new,

				 struct extent_state *other);

fs/btrfs/extent-io-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree, 
	int ret;



	if (tree->inode)

		btrfs_clear_delalloc_extent(&tree->inode->vfs_inode, state, bits);

		btrfs_clear_delalloc_extent(tree->inode, state, bits);



	ret = add_extent_changeset(state, bits_to_clear, changeset, 0);

	BUG_ON(ret < 0);

fs/btrfs/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -2471,11 +2471,10 @@ void btrfs_set_delalloc_extent(struct btrfs_inode *inode, struct extent_state *s 
 * Once a range is no longer delalloc this function ensures that proper

 * accounting happens.

 */

void btrfs_clear_delalloc_extent(struct inode *vfs_inode,

void btrfs_clear_delalloc_extent(struct btrfs_inode *inode,

				 struct extent_state *state, u32 bits)

{

	struct btrfs_inode *inode = BTRFS_I(vfs_inode);

	struct btrfs_fs_info *fs_info = btrfs_sb(vfs_inode->i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	u64 len = state->end + 1 - state->start;

	u32 num_extents = count_max_extents(fs_info, len);