btrfs-progs: sb-mod: add csum_type

[platform/upstream/btrfs-progs.git] / find-root.c

diff --git a/find-root.c b/find-root.c
index 823db6a..7e4c51f 100644 (file)
--- a/find-root.c
+++ b/find-root.c
@@ -30,7 +30,7 @@
 /* Return value is the same as btrfs_find_root_search(). */
 static int add_eb_to_result(struct extent_buffer *eb,
                            struct cache_tree *result,
-                           u32 leafsize,
+                           u32 nodesize,
                            struct btrfs_find_root_filter *filter,
                            struct cache_extent **match)
 {
@@ -80,7 +80,7 @@ static int add_eb_to_result(struct extent_buffer *eb,
        /* Same level, insert it into the eb_tree */
        if (level == gen_cache->highest_level) {
                ret = add_cache_extent(&gen_cache->eb_tree,
-                                      start, leafsize);
+                                      start, nodesize);
                if (ret < 0 && ret != -EEXIST)
                        return ret;
                ret = 0;
@@ -110,7 +110,7 @@ int btrfs_find_root_search(struct btrfs_fs_info *fs_info,
        u64 chunk_offset = 0;
        u64 chunk_size = 0;
        u64 offset = 0;
-       u32 leafsize = btrfs_super_leafsize(fs_info->super_copy);
+       u32 nodesize = btrfs_super_nodesize(fs_info->super_copy);
        int suppress_errors = 0;
        int ret = 0;
 
@@ -118,11 +118,11 @@ int btrfs_find_root_search(struct btrfs_fs_info *fs_info,
        fs_info->suppress_check_block_errors = 1;
        while (1) {
                if (filter->objectid != BTRFS_CHUNK_TREE_OBJECTID)
-                       ret = btrfs_next_bg_metadata(&fs_info->mapping_tree,
+                       ret = btrfs_next_bg_metadata(fs_info,
                                                  &chunk_offset,
                                                  &chunk_size);
                else
-                       ret = btrfs_next_bg_system(&fs_info->mapping_tree,
+                       ret = btrfs_next_bg_system(fs_info,
                                                &chunk_offset,
                                                &chunk_size);
                if (ret) {
@@ -132,12 +132,11 @@ int btrfs_find_root_search(struct btrfs_fs_info *fs_info,
                }
                for (offset = chunk_offset;
                     offset < chunk_offset + chunk_size;
-                    offset += leafsize) {
-                       eb = read_tree_block_fs_info(fs_info, offset, leafsize,
-                                                    0);
+                    offset += nodesize) {
+                       eb = read_tree_block(fs_info, offset, 0);
                        if (!eb || IS_ERR(eb))
                                continue;
-                       ret = add_eb_to_result(eb, result, leafsize, filter,
+                       ret = add_eb_to_result(eb, result, nodesize, filter,
                                               match);
                        free_extent_buffer(eb);
                        if (ret)