Signed-off-by: Nikolay Borisov <[email protected]>
---
fs/btrfs/tree-log.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 73a7e7b5aadc..834d90398cb4 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -842,7 +842,7 @@ static noinline int replay_one_extent(struct
btrfs_trans_handle *trans,
static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct btrfs_path *path,
- struct inode *dir,
+ struct btrfs_inode *dir,
struct btrfs_dir_item *di)
{
struct btrfs_fs_info *fs_info = root->fs_info;
@@ -874,7 +874,7 @@ static noinline int drop_one_dir_item(struct
btrfs_trans_handle *trans,
if (ret)
goto out;
- ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), BTRFS_I(inode),
name, name_len);
+ ret = btrfs_unlink_inode(trans, root, dir, BTRFS_I(inode), name,
name_len);
if (ret)
goto out;
else
@@ -1150,7 +1150,7 @@ static inline int __add_inode_ref(struct
btrfs_trans_handle *trans,
di = btrfs_lookup_dir_index_item(trans, root, path,
btrfs_ino(BTRFS_I(dir)),
ref_index, name, namelen, 0);
if (di && !IS_ERR(di)) {
- ret = drop_one_dir_item(trans, root, path, dir, di);
+ ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di);
if (ret)
return ret;
}
@@ -1160,7 +1160,7 @@ static inline int __add_inode_ref(struct
btrfs_trans_handle *trans,
di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(BTRFS_I(dir)),
name, namelen, 0);
if (di && !IS_ERR(di)) {
- ret = drop_one_dir_item(trans, root, path, dir, di);
+ ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di);
if (ret)
return ret;
}
@@ -1768,7 +1768,7 @@ static noinline int replay_one_name(struct
btrfs_trans_handle *trans,
if (!exists)
goto out;
- ret = drop_one_dir_item(trans, root, path, dir, dst_di);
+ ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), dst_di);
if (ret)
goto out;
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
