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. --- btrfs-map-logical.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'btrfs-map-logical.c') diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index e49a735e..9d049955 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -29,8 +29,9 @@ #include "transaction.h" #include "list.h" #include "utils.h" +#include "help.h" -#define BUFFER_SIZE (64 * 1024) +#define BUFFER_SIZE SZ_64K /* we write the mirror info to stdout unless they are dumping the data * to stdout @@ -81,7 +82,7 @@ again: } logical = key.objectid; if (key.type == BTRFS_METADATA_ITEM_KEY) - len = fs_info->tree_root->nodesize; + len = fs_info->nodesize; else len = key.offset; @@ -108,9 +109,8 @@ static int __print_mapping_info(struct btrfs_fs_info *fs_info, u64 logical, int i; cur_len = len - cur_offset; - ret = btrfs_map_block(&fs_info->mapping_tree, READ, - logical + cur_offset, &cur_len, - &multi, mirror_num, NULL); + ret = btrfs_map_block(fs_info, READ, logical + cur_offset, + &cur_len, &multi, mirror_num, NULL); if (ret) { fprintf(info_file, "Error: fails to map mirror%d logical %llu: %s\n", @@ -149,7 +149,7 @@ static int print_mapping_info(struct btrfs_fs_info *fs_info, u64 logical, int mirror_num; int ret = 0; - num_copies = btrfs_num_copies(&fs_info->mapping_tree, logical, len); + num_copies = btrfs_num_copies(fs_info, logical, len); for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) { ret = __print_mapping_info(fs_info, logical, len, mirror_num); if (ret < 0) @@ -169,7 +169,7 @@ static int write_extent_content(struct btrfs_fs_info *fs_info, int out_fd, while (cur_offset < length) { cur_len = min_t(u64, length - cur_offset, BUFFER_SIZE); - ret = read_extent_data(fs_info->tree_root, buffer, + ret = read_extent_data(fs_info, buffer, logical + cur_offset, &cur_len, mirror); if (ret < 0) { fprintf(stderr, @@ -285,7 +285,7 @@ int main(int argc, char **argv) } if (bytes == 0) - bytes = root->nodesize; + bytes = root->fs_info->nodesize; cur_logical = logical; cur_len = bytes; -- cgit v1.2.3