diff options
Diffstat (limited to 'volumes.c')
| -rw-r--r-- | volumes.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1680,7 +1680,7 @@ static struct btrfs_device *fill_missing_device(u64 devid) * slot == -1: SYSTEM chunk * return -EIO on error, otherwise return 0 */ -int btrfs_check_chunk_valid(struct btrfs_root *root, +int btrfs_check_chunk_valid(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf, struct btrfs_chunk *chunk, int slot, u64 logical) @@ -1691,7 +1691,7 @@ int btrfs_check_chunk_valid(struct btrfs_root *root, u16 sub_stripes; u64 type; u32 chunk_ondisk_size; - u32 sectorsize = root->fs_info->sectorsize; + u32 sectorsize = fs_info->sectorsize; length = btrfs_chunk_length(leaf, chunk); stripe_len = btrfs_chunk_stripe_len(leaf, chunk); @@ -1787,7 +1787,8 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key, struct extent_buffer *leaf, struct btrfs_chunk *chunk, int slot) { - struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree; + struct btrfs_fs_info *fs_info = root->fs_info; + struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree; struct map_lookup *map; struct cache_extent *ce; u64 logical; @@ -1802,7 +1803,7 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key, length = btrfs_chunk_length(leaf, chunk); num_stripes = btrfs_chunk_num_stripes(leaf, chunk); /* Validation check */ - ret = btrfs_check_chunk_valid(root, leaf, chunk, slot, logical); + ret = btrfs_check_chunk_valid(fs_info, leaf, chunk, slot, logical); if (ret) { error("%s checksums match, but it has an invalid chunk, %s", (slot == -1) ? "Superblock" : "Metadata", |