btrfs: Make btrfs_remove_delayed_node 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 b580053133d95b9b4820e39a7d1753818a3d33bc..8b5bb221b3cf038b0cbe6163d5c616a1b6dcb9f4 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1286,15 +1286,15 @@ int btrfs_commit_inode_delayed_inode(struct inode *inode)
        return ret;
 }
 
-void btrfs_remove_delayed_node(struct inode *inode)
+void btrfs_remove_delayed_node(struct btrfs_inode *inode)
 {
        struct btrfs_delayed_node *delayed_node;
 
-       delayed_node = READ_ONCE(BTRFS_I(inode)->delayed_node);
+       delayed_node = READ_ONCE(inode->delayed_node);
        if (!delayed_node)
                return;
 
-       BTRFS_I(inode)->delayed_node = NULL;
+       inode->delayed_node = NULL;
        btrfs_release_delayed_node(delayed_node);
 }
 

diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
index fbada25cd17e9fb51e2e6c9cc64e0491964eb01b..81572693d0e0fcfe458d12869da903254c27cdb4 100644 (file)
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
@@ -121,7 +121,7 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info);
 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_remove_delayed_node(struct btrfs_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 a72674c750972e11d81ef7e54b59827f1ce0ec57..f63fe82ca28b29b341067140d94529c5dc730da3 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5395,7 +5395,7 @@ void btrfs_evict_inode(struct inode *inode)
        btrfs_end_transaction(trans);
        btrfs_btree_balance_dirty(fs_info);
 no_delete:
-       btrfs_remove_delayed_node(inode);
+       btrfs_remove_delayed_node(BTRFS_I(inode));
        clear_inode(inode);
 }