From: Nikolay Borisov Date: Tue, 10 Jan 2017 18:35:41 +0000 (+0200) Subject: btrfs: Make btrfs_commit_inode_delayed_items take btrfs_inode X-Git-Tag: v4.11-rc1~69^2~100 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5f4b32e94aabaff1b86ba4ed701f01689d59bc90;p=linux.git btrfs: Make btrfs_commit_inode_delayed_items 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 0470a7eb489e..11ee1ad6bc3d 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1194,9 +1194,9 @@ int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans, } int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, - struct inode *inode) + struct btrfs_inode *inode) { - struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(BTRFS_I(inode)); + struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode); struct btrfs_path *path; struct btrfs_block_rsv *block_rsv; int ret; diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index cd80fe8f150f..40bf1a943146 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -119,7 +119,7 @@ int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans, 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); + struct btrfs_inode *inode); /* Used for evicting the inode. */ void btrfs_remove_delayed_node(struct btrfs_inode *inode); void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode); diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 85186fbee0ec..b814cd7bbe70 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4656,7 +4656,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, */ if (S_ISDIR(inode->i_mode) || BTRFS_I(inode)->generation > fs_info->last_trans_committed) - ret = btrfs_commit_inode_delayed_items(trans, inode); + ret = btrfs_commit_inode_delayed_items(trans, BTRFS_I(inode)); else ret = btrfs_commit_inode_delayed_inode(BTRFS_I(inode));