Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 08:48:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

btrfs: Make btrfs_check_ref_name_override take btrfs_inode

Browse Source 
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:35 +02:00 committed by David Sterba
parent 481b01c0d3
commit 4791c8f19c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/btrfs/tree-log.c
View File

@ -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,
const int slot,
const struct btrfs_key *key,
struct inode *inode,
struct btrfs_inode *inode,
u64 *other_ino)
{
int ret;
@ -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);
di = btrfs_lookup_dir_item(NULL, BTRFS_I(inode)->root,
search_path, parent,
name, this_name_len, 0);
di = btrfs_lookup_dir_item(NULL, inode->root, search_path,
parent, name, this_name_len, 0);
if (di && !IS_ERR(di)) {
struct btrfs_key di_key;
@ -4769,7 +4768,7 @@ again:
ret = btrfs_check_ref_name_override(path->nodes[0],
path->slots[0],
&min_key, inode,
&min_key, BTRFS_I(inode),
&other_ino);
if (ret < 0) {
err = ret;