diff options
| author | Nikolay Borisov <n.borisov.lkml@gmail.com> | 2017-01-18 00:31:35 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-02-14 15:50:55 +0100 |
| commit | 4791c8f19c45d1a4e7fb5e9a6da532f7cd1fca99 (patch) | |
| tree | e08d3398277ccfaf5e0ef16258d96b157fefbc60 /fs | |
| parent | 481b01c0d3cbbca7a97f140286738a3e02ac9d4c (diff) | |
| download | talos-obmc-linux-4791c8f19c45d1a4e7fb5e9a6da532f7cd1fca99.tar.gz talos-obmc-linux-4791c8f19c45d1a4e7fb5e9a6da532f7cd1fca99.zip | |
btrfs: Make btrfs_check_ref_name_override take btrfs_inode
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/tree-log.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 20718cfebf89..7669e95be423 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -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; |
