btrfs: Make log_new_dir_dentries take btrfs_inode

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2017-01-18 00:31:43 +02:00 коммит произвёл David Sterba
Родитель dbf39ea48b
Коммит 51cc0d3227
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -5155,7 +5155,7 @@ struct btrfs_dir_list {
*/ */
static int log_new_dir_dentries(struct btrfs_trans_handle *trans, static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct inode *start_inode, struct btrfs_inode *start_inode,
struct btrfs_log_ctx *ctx) struct btrfs_log_ctx *ctx)
{ {
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
@ -5174,7 +5174,7 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
btrfs_free_path(path); btrfs_free_path(path);
return -ENOMEM; return -ENOMEM;
} }
dir_elem->ino = btrfs_ino(BTRFS_I(start_inode)); dir_elem->ino = btrfs_ino(start_inode);
list_add_tail(&dir_elem->list, &dir_list); list_add_tail(&dir_elem->list, &dir_list);
while (!list_empty(&dir_list)) { while (!list_empty(&dir_list)) {
@ -5368,7 +5368,7 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
ret = 1; ret = 1;
if (!ret && ctx && ctx->log_new_dentries) if (!ret && ctx && ctx->log_new_dentries)
ret = log_new_dir_dentries(trans, root, ret = log_new_dir_dentries(trans, root,
dir_inode, ctx); BTRFS_I(dir_inode), ctx);
iput(dir_inode); iput(dir_inode);
if (ret) if (ret)
goto out; goto out;
@ -5531,7 +5531,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
old_parent = parent; old_parent = parent;
} }
if (log_dentries) if (log_dentries)
ret = log_new_dir_dentries(trans, root, orig_inode, ctx); ret = log_new_dir_dentries(trans, root, BTRFS_I(orig_inode), ctx);
else else
ret = 0; ret = 0;
end_trans: end_trans: