btrfs: pass btrfs_inode to btrfs_clear_delalloc_extent

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

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index ddf1867ba6d5620d645d4838554cb6ddecb4d1fa..9e31dc8b0285c8e06a25558d6ed4498e3f16132d 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -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);

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index 124aede5e4921344ef27f9889777d96ce3efa088..285b0ff6e953e343f004236e39e0dcab2ef7e511 100644 (file)
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -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);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index a43d7a063807680c3f9d9fb3bb5072b5ca19025f..59ec9b2ef508518b78e3b3665ecea0e0820c503a 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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);