diff --git a/backref.c b/backref.c index 0423a2b3..afd14235 100644 --- a/backref.c +++ b/backref.c @@ -450,8 +450,7 @@ 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, ref->wanted_disk_byte, - fs_info->nodesize, 0); + eb = read_tree_block(fs_info, ref->wanted_disk_byte, 0); if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); return -EIO; @@ -804,8 +803,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, ref->level == 0) { struct extent_buffer *eb; - eb = read_tree_block(fs_info, ref->parent, - fs_info->nodesize, 0); + eb = read_tree_block(fs_info, ref->parent, 0); if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); ret = -EIO; diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 3269de5c..297841c1 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -168,7 +168,7 @@ static int corrupt_keys_in_block(struct btrfs_fs_info *fs_info, u64 bytenr) { struct extent_buffer *eb; - eb = read_tree_block(fs_info, bytenr, fs_info->nodesize, 0); + eb = read_tree_block(fs_info, bytenr, 0); if (!extent_buffer_uptodate(eb)) return -EIO;; @@ -297,7 +297,6 @@ static void btrfs_corrupt_extent_tree(struct btrfs_trans_handle *trans, struct extent_buffer *next; next = read_tree_block(fs_info, btrfs_node_blockptr(eb, i), - fs_info->nodesize, btrfs_node_ptr_generation(eb, i)); if (!extent_buffer_uptodate(next)) continue; @@ -765,7 +764,7 @@ static int corrupt_metadata_block(struct btrfs_fs_info *fs_info, u64 block, return -EINVAL; } - eb = read_tree_block(fs_info, block, fs_info->nodesize, 0); + eb = read_tree_block(fs_info, block, 0); if (!extent_buffer_uptodate(eb)) { fprintf(stderr, "Couldn't read in tree block %s\n", field); return -EINVAL; diff --git a/btrfstune.c b/btrfstune.c index 1ed73a92..0139e408 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -149,7 +149,7 @@ static int change_extents_uuid(struct btrfs_fs_info *fs_info) goto next; bytenr = key.objectid; - eb = read_tree_block(fs_info, bytenr, fs_info->nodesize, 0); + eb = read_tree_block(fs_info, bytenr, 0); if (IS_ERR(eb)) { error("failed to read tree block: %llu", bytenr); ret = PTR_ERR(eb); diff --git a/cmds-check.c b/cmds-check.c index 7a973e32..dd33d9b2 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -2190,8 +2190,7 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, if (!next || !btrfs_buffer_uptodate(next, ptr_gen)) { free_extent_buffer(next); reada_walk_down(root, cur, path->slots[*level]); - next = read_tree_block(root->fs_info, bytenr, - fs_info->nodesize, ptr_gen); + next = read_tree_block(root->fs_info, bytenr, ptr_gen); if (!extent_buffer_uptodate(next)) { struct btrfs_key node_key; @@ -2304,8 +2303,7 @@ static int walk_down_tree_v2(struct btrfs_root *root, struct btrfs_path *path, if (!next || !btrfs_buffer_uptodate(next, ptr_gen)) { free_extent_buffer(next); reada_walk_down(root, cur, path->slots[*level]); - next = read_tree_block(fs_info, bytenr, - fs_info->nodesize, ptr_gen); + next = read_tree_block(fs_info, bytenr, ptr_gen); if (!extent_buffer_uptodate(next)) { struct btrfs_key node_key; @@ -7683,7 +7681,7 @@ static int run_next_block(struct btrfs_root *root, } /* fixme, get the real parent transid */ - buf = read_tree_block(root->fs_info, bytenr, size, gen); + buf = read_tree_block(root->fs_info, bytenr, gen); if (!extent_buffer_uptodate(buf)) { record_bad_block_io(root->fs_info, extent_cache, bytenr, size); @@ -9796,8 +9794,7 @@ static int deal_root_from_list(struct list_head *list, rec = list_entry(list->next, struct root_item_record, list); last = 0; - buf = read_tree_block(root->fs_info, - rec->bytenr, rec->level_size, 0); + buf = read_tree_block(root->fs_info, rec->bytenr, 0); if (!extent_buffer_uptodate(buf)) { free_extent_buffer(buf); ret = -EIO; @@ -10441,7 +10438,7 @@ static int query_tree_block_level(struct btrfs_fs_info *fs_info, u64 bytenr) btrfs_release_path(&path); /* Get level from tree block as an alternative source */ - eb = read_tree_block(fs_info, bytenr, fs_info->nodesize, transid); + eb = read_tree_block(fs_info, bytenr, transid); if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); return -EIO; @@ -10494,7 +10491,7 @@ static int check_tree_block_backref(struct btrfs_fs_info *fs_info, u64 root_id, } /* Read out the tree block to get item/node key */ - eb = read_tree_block(fs_info, bytenr, root->fs_info->nodesize, 0); + eb = read_tree_block(fs_info, bytenr, 0); if (!extent_buffer_uptodate(eb)) { err |= REFERENCER_MISSING; free_extent_buffer(eb); @@ -10595,7 +10592,7 @@ static int check_shared_block_backref(struct btrfs_fs_info *fs_info, int found_parent = 0; int i; - eb = read_tree_block(fs_info, parent, fs_info->nodesize, 0); + eb = read_tree_block(fs_info, parent, 0); if (!extent_buffer_uptodate(eb)) goto out; @@ -10748,7 +10745,7 @@ static int check_shared_data_backref(struct btrfs_fs_info *fs_info, int found_parent = 0; int i; - eb = read_tree_block(fs_info, parent, fs_info->nodesize, 0); + eb = read_tree_block(fs_info, parent, 0); if (!extent_buffer_uptodate(eb)) goto out; @@ -11510,8 +11507,7 @@ static int traverse_tree_block(struct btrfs_root *root, * As a btrfs tree has most 8 levels (0..7), so it's quite safe * to call the function itself. */ - eb = read_tree_block(root->fs_info, blocknr, - root->fs_info->nodesize, 0); + eb = read_tree_block(root->fs_info, blocknr, 0); if (extent_buffer_uptodate(eb)) { ret = traverse_tree_block(root, eb); err |= ret; @@ -11695,7 +11691,7 @@ static int pin_down_tree_blocks(struct btrfs_fs_info *fs_info, * in, but for now this doesn't actually use the root so * just pass in extent_root. */ - tmp = read_tree_block(fs_info, bytenr, fs_info->nodesize, 0); + tmp = read_tree_block(fs_info, bytenr, 0); if (!extent_buffer_uptodate(tmp)) { fprintf(stderr, "Error reading root block\n"); return -EIO; @@ -11714,8 +11710,7 @@ static int pin_down_tree_blocks(struct btrfs_fs_info *fs_info, continue; } - tmp = read_tree_block(fs_info, bytenr, - fs_info->nodesize, 0); + tmp = read_tree_block(fs_info, bytenr, 0); if (!extent_buffer_uptodate(tmp)) { fprintf(stderr, "Error reading tree block\n"); return -EIO; diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c index 496498f3..4e72c08a 100644 --- a/cmds-inspect-dump-tree.c +++ b/cmds-inspect-dump-tree.c @@ -51,7 +51,7 @@ static void print_extents(struct btrfs_root *root, struct extent_buffer *eb) for (i = 0; i < nr; i++) { next = read_tree_block(root->fs_info, btrfs_node_blockptr(eb, i), - root->fs_info->nodesize, btrfs_node_ptr_generation(eb, i)); + btrfs_node_ptr_generation(eb, i)); if (!extent_buffer_uptodate(next)) continue; if (btrfs_is_leaf(next) && btrfs_header_level(eb) != 1) { @@ -310,21 +310,15 @@ int cmd_inspect_dump_tree(int argc, char **argv) if (block_only) { root = info->chunk_root; - leaf = read_tree_block(info, - block_only, - info->nodesize, 0); - + leaf = read_tree_block(info, block_only, 0); if (extent_buffer_uptodate(leaf) && btrfs_header_level(leaf) != 0) { free_extent_buffer(leaf); leaf = NULL; } - if (!leaf) { - leaf = read_tree_block(info, - block_only, - info->nodesize, 0); - } + if (!leaf) + leaf = read_tree_block(info, block_only, 0); if (!extent_buffer_uptodate(leaf)) { error("failed to read %llu", (unsigned long long)block_only); @@ -444,8 +438,7 @@ again: offset = btrfs_item_ptr_offset(leaf, slot); read_extent_buffer(leaf, &ri, offset, sizeof(ri)); - buf = read_tree_block(info, btrfs_root_bytenr(&ri), - info->nodesize, 0); + buf = read_tree_block(info, btrfs_root_bytenr(&ri), 0); if (!extent_buffer_uptodate(buf)) goto next; if (tree_id && found_key.objectid != tree_id) { diff --git a/cmds-inspect-tree-stats.c b/cmds-inspect-tree-stats.c index bcba7fb1..82a6a16c 100644 --- a/cmds-inspect-tree-stats.c +++ b/cmds-inspect-tree-stats.c @@ -153,7 +153,6 @@ static int walk_nodes(struct btrfs_root *root, struct btrfs_path *path, path->slots[level] = i; if ((level - 1) > 0 || find_inline) { tmp = read_tree_block(root->fs_info, cur_blocknr, - nodesize, btrfs_node_ptr_generation(b, i)); if (!extent_buffer_uptodate(tmp)) { error("failed to read blocknr %llu", diff --git a/cmds-restore.c b/cmds-restore.c index c174bdd5..ebc5e5ab 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -1255,7 +1255,7 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location, root_location = btrfs_super_root(fs_info->super_copy); generation = btrfs_super_generation(fs_info->super_copy); root->node = read_tree_block(fs_info, root_location, - fs_info->nodesize, generation); + generation); if (!extent_buffer_uptodate(root->node)) { fprintf(stderr, "Error opening tree root\n"); close_ctree(root); @@ -1501,8 +1501,7 @@ int cmd_restore(int argc, char **argv) if (fs_location != 0) { free_extent_buffer(root->node); - root->node = read_tree_block(root->fs_info, fs_location, - root->fs_info->nodesize, 0); + root->node = read_tree_block(root->fs_info, fs_location, 0); if (!extent_buffer_uptodate(root->node)) { fprintf(stderr, "Failed to read fs location\n"); ret = 1; diff --git a/ctree.c b/ctree.c index 96c89577..8d081880 100644 --- a/ctree.c +++ b/ctree.c @@ -650,7 +650,6 @@ struct extent_buffer *read_node_slot(struct btrfs_fs_info *fs_info, return NULL; return read_tree_block(fs_info, btrfs_node_blockptr(parent, slot), - fs_info->nodesize, btrfs_node_ptr_generation(parent, slot)); } diff --git a/disk-io.c b/disk-io.c index df262f6b..1ea2ac90 100644 --- a/disk-io.c +++ b/disk-io.c @@ -299,8 +299,7 @@ int read_whole_eb(struct btrfs_fs_info *info, struct extent_buffer *eb, int mirr return 0; } -struct extent_buffer* read_tree_block( - struct btrfs_fs_info *fs_info, u64 bytenr, u32 blocksize, +struct extent_buffer* read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, u64 parent_transid) { int ret; @@ -308,6 +307,7 @@ struct extent_buffer* read_tree_block( u64 best_transid = 0; u32 sectorsize = fs_info->sectorsize; u32 nodesize = fs_info->nodesize; + u32 blocksize = fs_info->nodesize; int mirror_num = 0; int good_mirror = 0; int num_copies; @@ -625,8 +625,7 @@ static int find_and_setup_root(struct btrfs_root *tree_root, generation = btrfs_root_generation(&root->root_item); root->node = read_tree_block(fs_info, - btrfs_root_bytenr(&root->root_item), - fs_info->nodesize, generation); + btrfs_root_bytenr(&root->root_item), generation); if (!extent_buffer_uptodate(root->node)) return -EIO; @@ -652,7 +651,6 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root, BTRFS_TREE_LOG_OBJECTID); log_root->node = read_tree_block(fs_info, blocknr, - fs_info->nodesize, btrfs_super_generation(disk_super) + 1); fs_info->log_root_tree = log_root; @@ -739,8 +737,7 @@ out: } generation = btrfs_root_generation(&root->root_item); root->node = read_tree_block(fs_info, - btrfs_root_bytenr(&root->root_item), - fs_info->nodesize, generation); + btrfs_root_bytenr(&root->root_item), generation); if (!extent_buffer_uptodate(root->node)) { free(root); return ERR_PTR(-EIO); @@ -997,8 +994,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr, generation = btrfs_backup_tree_root_gen(backup); } - root->node = read_tree_block(fs_info, root_tree_bytenr, fs_info->nodesize, - generation); + root->node = read_tree_block(fs_info, root_tree_bytenr, generation); if (!extent_buffer_uptodate(root->node)) { fprintf(stderr, "Couldn't read tree root\n"); return -EIO; @@ -1184,7 +1180,6 @@ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info, fs_info->chunk_root->node = read_tree_block(fs_info, chunk_root_bytenr, - fs_info->nodesize, generation); if (!extent_buffer_uptodate(fs_info->chunk_root->node)) { if (fs_info->ignore_chunk_tree_error) { diff --git a/disk-io.h b/disk-io.h index dfe4cf01..bdf4a89c 100644 --- a/disk-io.h +++ b/disk-io.h @@ -115,8 +115,7 @@ static inline u64 btrfs_sb_offset(int mirror) struct btrfs_device; int read_whole_eb(struct btrfs_fs_info *info, struct extent_buffer *eb, int mirror); -struct extent_buffer* read_tree_block( - struct btrfs_fs_info *fs_info, u64 bytenr, u32 blocksize, +struct extent_buffer* read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, u64 parent_transid); int read_extent_data(struct btrfs_fs_info *fs_info, char *data, u64 logical, diff --git a/find-root.c b/find-root.c index 1765adf8..7e4c51f6 100644 --- a/find-root.c +++ b/find-root.c @@ -133,7 +133,7 @@ int btrfs_find_root_search(struct btrfs_fs_info *fs_info, for (offset = chunk_offset; offset < chunk_offset + chunk_size; offset += nodesize) { - eb = read_tree_block(fs_info, offset, nodesize, 0); + eb = read_tree_block(fs_info, offset, 0); if (!eb || IS_ERR(eb)) continue; ret = add_eb_to_result(eb, result, nodesize, filter, diff --git a/image/main.c b/image/main.c index 4911100d..8778bc2a 100644 --- a/image/main.c +++ b/image/main.c @@ -974,8 +974,7 @@ static int flush_pending(struct metadump_struct *md, int done) u64 this_read = min((u64)md->root->fs_info->nodesize, size); - eb = read_tree_block(md->root->fs_info, start, - this_read, 0); + eb = read_tree_block(md->root->fs_info, start, 0); if (!extent_buffer_uptodate(eb)) { free(async->buffer); free(async); @@ -1106,8 +1105,7 @@ static int copy_tree_blocks(struct btrfs_root *root, struct extent_buffer *eb, continue; ri = btrfs_item_ptr(eb, i, struct btrfs_root_item); bytenr = btrfs_disk_root_bytenr(eb, ri); - tmp = read_tree_block(fs_info, bytenr, - fs_info->nodesize, 0); + tmp = read_tree_block(fs_info, bytenr, 0); if (!extent_buffer_uptodate(tmp)) { error("unable to read log root block"); return -EIO; @@ -1118,8 +1116,7 @@ static int copy_tree_blocks(struct btrfs_root *root, struct extent_buffer *eb, return ret; } else { bytenr = btrfs_node_blockptr(eb, i); - tmp = read_tree_block(fs_info, bytenr, - fs_info->nodesize, 0); + tmp = read_tree_block(fs_info, bytenr, 0); if (!extent_buffer_uptodate(tmp)) { error("unable to read log root block"); return -EIO; diff --git a/print-tree.c b/print-tree.c index 975b5d06..4d251b52 100644 --- a/print-tree.c +++ b/print-tree.c @@ -1313,7 +1313,7 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol for (i = 0; i < nr; i++) { next = read_tree_block(root->fs_info, - btrfs_node_blockptr(eb, i), root->fs_info->nodesize, + btrfs_node_blockptr(eb, i), btrfs_node_ptr_generation(eb, i)); if (!extent_buffer_uptodate(next)) { fprintf(stderr, "failed to read %llu in tree %llu\n", diff --git a/qgroup-verify.c b/qgroup-verify.c index 5162adbb..571b4d4f 100644 --- a/qgroup-verify.c +++ b/qgroup-verify.c @@ -711,7 +711,7 @@ static int travel_tree(struct btrfs_fs_info *info, struct btrfs_root *root, // printf("travel_tree: bytenr: %llu\tnum_bytes: %llu\tref_parent: %llu\n", // bytenr, num_bytes, ref_parent); - eb = read_tree_block(info, bytenr, num_bytes, 0); + eb = read_tree_block(info, bytenr, 0); if (!extent_buffer_uptodate(eb)) return -EIO;