From 6a0440391da7a99ffab94ccc66264af9b5f3ce34 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Mon, 31 Jul 2017 14:54:24 +0100 Subject: New upstream release. --- backref.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'backref.c') diff --git a/backref.c b/backref.c index a43e80da..ce12bbdf 100644 --- a/backref.c +++ b/backref.c @@ -20,7 +20,7 @@ #include "ctree.h" #include "disk-io.h" #include "backref.h" -#include "ulist.h" +#include "kernel-shared/ulist.h" #include "transaction.h" #include "internal.h" @@ -450,8 +450,8 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, if (ref->key_for_search.type) continue; BUG_ON(!ref->wanted_disk_byte); - eb = read_tree_block(fs_info->tree_root, ref->wanted_disk_byte, - fs_info->tree_root->nodesize, 0); + eb = read_tree_block(fs_info, ref->wanted_disk_byte, + fs_info->nodesize, 0); if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); return -EIO; @@ -804,9 +804,9 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, ref->level == 0) { u32 bsz; struct extent_buffer *eb; - bsz = fs_info->extent_root->nodesize; - eb = read_tree_block(fs_info->extent_root, - ref->parent, bsz, 0); + bsz = fs_info->nodesize; + eb = read_tree_block(fs_info, + ref->parent, bsz, 0); if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); ret = -EIO; @@ -1154,7 +1154,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, } btrfs_item_key_to_cpu(path->nodes[0], found_key, path->slots[0]); if (found_key->type == BTRFS_METADATA_ITEM_KEY) - size = fs_info->extent_root->nodesize; + size = fs_info->nodesize; else if (found_key->type == BTRFS_EXTENT_ITEM_KEY) size = found_key->offset; -- cgit v1.2.3