diff options
| author | Nikolay Borisov <n.borisov.lkml@gmail.com> | 2017-01-10 20:35:37 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-02-14 15:50:52 +0100 |
| commit | e07222c7d20633b86d3af9d55f97d687837b7c02 (patch) | |
| tree | 57c83cccad417e6c35e41011643eb34f355576de | |
| parent | e67bbbb9d0292df834e9e5366aba605233a699c7 (diff) | |
| download | linux-stable-e07222c7d20633b86d3af9d55f97d687837b7c02.tar.gz linux-stable-e07222c7d20633b86d3af9d55f97d687837b7c02.tar.bz2 linux-stable-e07222c7d20633b86d3af9d55f97d687837b7c02.zip | |
btrfs: Make btrfs_delayed_delete_inode_ref take btrfs_inode
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 6 | ||||
| -rw-r--r-- | fs/btrfs/delayed-inode.h | 2 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index e4364c1ba99b..6e4154a19e67 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1854,9 +1854,9 @@ release_node: return ret; } -int btrfs_delayed_delete_inode_ref(struct inode *inode) +int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb); struct btrfs_delayed_node *delayed_node; /* @@ -1867,7 +1867,7 @@ int btrfs_delayed_delete_inode_ref(struct inode *inode) if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) return -EAGAIN; - delayed_node = btrfs_get_or_create_delayed_node(BTRFS_I(inode)); + delayed_node = btrfs_get_or_create_delayed_node(inode); if (IS_ERR(delayed_node)) return PTR_ERR(delayed_node); diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index adf6a8a0b23a..dbb02f4d5dda 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -129,7 +129,7 @@ int btrfs_commit_inode_delayed_inode(struct inode *inode); int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct inode *inode); int btrfs_fill_inode(struct inode *inode, u32 *rdev); -int btrfs_delayed_delete_inode_ref(struct inode *inode); +int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode); /* Used for drop dead root */ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 31917f9c1a9b..5afc98f3a560 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4029,7 +4029,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, * we update the inode item. */ if (BTRFS_I(inode)->dir_index) { - ret = btrfs_delayed_delete_inode_ref(inode); + ret = btrfs_delayed_delete_inode_ref(BTRFS_I(inode)); if (!ret) { index = BTRFS_I(inode)->dir_index; goto skip_backref; |