btrfs: Make btrfs_kill_delayed_inode_items take btrfs_inode

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 6e4154a19e67d2998c6e581302079d6ff8e72027..b580053133d95b9b4820e39a7d1753818a3d33bc 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1931,11 +1931,11 @@ static void __btrfs_kill_delayed_node(struct btrfs_delayed_node *delayed_node)
        mutex_unlock(&delayed_node->mutex);
 }
 
-void btrfs_kill_delayed_inode_items(struct inode *inode)
+void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode)
 {
        struct btrfs_delayed_node *delayed_node;
 
-       delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
+       delayed_node = btrfs_get_delayed_node(inode);
        if (!delayed_node)
                return;
 

diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
index dbb02f4d5ddaff340b18187bc25536ac1c43b1e5..fbada25cd17e9fb51e2e6c9cc64e0491964eb01b 100644 (file)
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
@@ -122,7 +122,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
                                     struct inode *inode);
 /* Used for evicting the inode. */
 void btrfs_remove_delayed_node(struct inode *inode);
-void btrfs_kill_delayed_inode_items(struct inode *inode);
+void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode);
 int btrfs_commit_inode_delayed_inode(struct inode *inode);
 
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5afc98f3a5600647093a4f259852dbee2798af62..a72674c750972e11d81ef7e54b59827f1ce0ec57 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4425,7 +4425,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
         * items.
         */
        if (min_type == 0 && root == BTRFS_I(inode)->root)
-               btrfs_kill_delayed_inode_items(inode);
+               btrfs_kill_delayed_inode_items(BTRFS_I(inode));
 
        key.objectid = ino;
        key.offset = (u64)-1;