Commit 4791c8f1 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Make btrfs_check_ref_name_override take btrfs_inode

Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 481b01c0
...@@ -4495,7 +4495,7 @@ static int btrfs_log_trailing_hole(struct btrfs_trans_handle *trans, ...@@ -4495,7 +4495,7 @@ static int btrfs_log_trailing_hole(struct btrfs_trans_handle *trans,
static int btrfs_check_ref_name_override(struct extent_buffer *eb, static int btrfs_check_ref_name_override(struct extent_buffer *eb,
const int slot, const int slot,
const struct btrfs_key *key, const struct btrfs_key *key,
struct inode *inode, struct btrfs_inode *inode,
u64 *other_ino) u64 *other_ino)
{ {
int ret; int ret;
...@@ -4551,9 +4551,8 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb, ...@@ -4551,9 +4551,8 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb,
} }
read_extent_buffer(eb, name, name_ptr, this_name_len); read_extent_buffer(eb, name, name_ptr, this_name_len);
di = btrfs_lookup_dir_item(NULL, BTRFS_I(inode)->root, di = btrfs_lookup_dir_item(NULL, inode->root, search_path,
search_path, parent, parent, name, this_name_len, 0);
name, this_name_len, 0);
if (di && !IS_ERR(di)) { if (di && !IS_ERR(di)) {
struct btrfs_key di_key; struct btrfs_key di_key;
...@@ -4769,7 +4768,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, ...@@ -4769,7 +4768,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
ret = btrfs_check_ref_name_override(path->nodes[0], ret = btrfs_check_ref_name_override(path->nodes[0],
path->slots[0], path->slots[0],
&min_key, inode, &min_key, BTRFS_I(inode),
&other_ino); &other_ino);
if (ret < 0) { if (ret < 0) {
err = ret; err = ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment