Btrfs: Pass fs_info to btrfs_num_copies() instead of mapping_tree
This is required for the device replace procedure in a later step. Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:

committed by
Josef Bacik

parent
7ba15b7d21
commit
5d9640517d
@@ -723,7 +723,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
|
||||
}
|
||||
|
||||
num_copies =
|
||||
btrfs_num_copies(&state->root->fs_info->mapping_tree,
|
||||
btrfs_num_copies(state->root->fs_info,
|
||||
next_bytenr, state->metablock_size);
|
||||
if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
|
||||
printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
|
||||
@@ -903,7 +903,7 @@ static int btrfsic_process_superblock_dev_mirror(
|
||||
}
|
||||
|
||||
num_copies =
|
||||
btrfs_num_copies(&state->root->fs_info->mapping_tree,
|
||||
btrfs_num_copies(state->root->fs_info,
|
||||
next_bytenr, state->metablock_size);
|
||||
if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
|
||||
printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
|
||||
@@ -1287,7 +1287,7 @@ static int btrfsic_create_link_to_next_block(
|
||||
*next_blockp = NULL;
|
||||
if (0 == *num_copiesp) {
|
||||
*num_copiesp =
|
||||
btrfs_num_copies(&state->root->fs_info->mapping_tree,
|
||||
btrfs_num_copies(state->root->fs_info,
|
||||
next_bytenr, state->metablock_size);
|
||||
if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
|
||||
printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
|
||||
@@ -1489,7 +1489,7 @@ static int btrfsic_handle_extent_data(
|
||||
chunk_len = num_bytes;
|
||||
|
||||
num_copies =
|
||||
btrfs_num_copies(&state->root->fs_info->mapping_tree,
|
||||
btrfs_num_copies(state->root->fs_info,
|
||||
next_bytenr, state->datablock_size);
|
||||
if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
|
||||
printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
|
||||
@@ -2463,7 +2463,7 @@ static int btrfsic_process_written_superblock(
|
||||
}
|
||||
|
||||
num_copies =
|
||||
btrfs_num_copies(&state->root->fs_info->mapping_tree,
|
||||
btrfs_num_copies(state->root->fs_info,
|
||||
next_bytenr, BTRFS_SUPER_INFO_SIZE);
|
||||
if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
|
||||
printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
|
||||
@@ -2960,7 +2960,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
|
||||
struct btrfsic_block_data_ctx block_ctx;
|
||||
int match = 0;
|
||||
|
||||
num_copies = btrfs_num_copies(&state->root->fs_info->mapping_tree,
|
||||
num_copies = btrfs_num_copies(state->root->fs_info,
|
||||
bytenr, state->metablock_size);
|
||||
|
||||
for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
|
||||
|
Reference in New Issue
Block a user