Signed-off-by: Nikolay Borisov <n.borisov.l...@gmail.com>
---
fs/btrfs/tree-log.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 35434d686653..d919cd4252ba 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -991,7 +991,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle
*trans,
struct btrfs_root *root,
struct btrfs_path *path,
struct btrfs_root *log_root,
- struct inode *dir, struct inode *inode,
+ struct btrfs_inode *dir, struct btrfs_inode
*inode,
struct extent_buffer *eb,
u64 inode_objectid, u64 parent_objectid,
u64 ref_index, char *name, int namelen,
@@ -1047,12 +1047,11 @@ static inline int __add_inode_ref(struct
btrfs_trans_handle *trans,
parent_objectid,
victim_name,
victim_name_len)) {
- inc_nlink(inode);
+ inc_nlink(&inode->vfs_inode);
btrfs_release_path(path);
- ret = btrfs_unlink_inode(trans, root,
BTRFS_I(dir),
- BTRFS_I(inode),
victim_name,
- victim_name_len);
+ ret = btrfs_unlink_inode(trans, root, dir,
inode,
+ victim_name, victim_name_len);
kfree(victim_name);
if (ret)
return ret;
@@ -1114,15 +1113,14 @@ static inline int __add_inode_ref(struct
btrfs_trans_handle *trans,
parent_objectid, victim_name,
victim_name_len)) {
ret = -ENOENT;
- victim_parent = read_one_inode(root,
- parent_objectid);
+ victim_parent = read_one_inode(root,
parent_objectid);
if (victim_parent) {
- inc_nlink(inode);
+ inc_nlink(&inode->vfs_inode);
btrfs_release_path(path);
ret = btrfs_unlink_inode(trans, root,
BTRFS_I(victim_parent),
- BTRFS_I(inode),
+ inode,
victim_name,
victim_name_len);
if (!ret)
@@ -1148,20 +1146,20 @@ static inline int __add_inode_ref(struct
btrfs_trans_handle *trans,
btrfs_release_path(path);
/* look for a conflicting sequence number */
- di = btrfs_lookup_dir_index_item(trans, root, path,
btrfs_ino(BTRFS_I(dir)),
+ di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(dir),
ref_index, name, namelen, 0);
if (di && !IS_ERR(di)) {
- ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di);
+ ret = drop_one_dir_item(trans, root, path, dir, di);
if (ret)
return ret;
}
btrfs_release_path(path);
/* look for a conflicing name */
- di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(BTRFS_I(dir)),
+ di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(dir),
name, namelen, 0);
if (di && !IS_ERR(di)) {
- ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di);
+ ret = drop_one_dir_item(trans, root, path, dir, di);
if (ret)
return ret;
}
@@ -1307,7 +1305,7 @@ static noinline int add_inode_ref(struct
btrfs_trans_handle *trans,
if (!search_done) {
ret = __add_inode_ref(trans, root, path, log,
- dir, inode, eb,
+ BTRFS_I(dir),
BTRFS_I(inode), eb,
inode_objectid,
parent_objectid,
ref_index, name, namelen,
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
