From: Nikolay Borisov Date: Tue, 10 Jan 2017 18:35:39 +0000 (+0200) Subject: btrfs: Make btrfs_remove_delayed_node take btrfs_inode X-Git-Tag: v4.11-rc1~69^2~102 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f48d1cf59ca49d898d1c96fa480eeeeabeaa42be;p=linux.git btrfs: Make btrfs_remove_delayed_node take btrfs_inode Signed-off-by: Nikolay Borisov Signed-off-by: David Sterba --- diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index b580053133d9..8b5bb221b3cf 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1286,15 +1286,15 @@ out: 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 fbada25cd17e..81572693d0e0 100644 --- 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 a72674c75097..f63fe82ca28b 100644 --- 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); }