Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d964051 authored by Stefan Behrens's avatar Stefan Behrens Committed by Josef Bacik
Browse files

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: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 7ba15b7d

fs/btrfs/check-integrity.c

+6 −6
Original line number Diff line number Diff line
@@ -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++) {

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root, 
		if (test_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags))

			break;



		num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,

		num_copies = btrfs_num_copies(root->fs_info,

					      eb->start, eb->len);

		if (num_copies == 1)

			break;

fs/btrfs/extent_io.c

+5 −6
Original line number Diff line number Diff line
@@ -2044,10 +2044,10 @@ static int clean_io_failure(u64 start, struct page *page) 
	spin_unlock(&BTRFS_I(inode)->io_tree.lock);



	if (state && state->start == failrec->start) {

		map_tree = &BTRFS_I(inode)->root->fs_info->mapping_tree;

		num_copies = btrfs_num_copies(map_tree, failrec->logical,

						failrec->len);

		num_copies = btrfs_num_copies(BTRFS_I(inode)->root->fs_info,

					      failrec->logical, failrec->len);

		if (num_copies > 1)  {

			map_tree = &BTRFS_I(inode)->root->fs_info->mapping_tree;

			ret = repair_io_failure(map_tree, start, failrec->len,

						failrec->logical, page,

						failrec->failed_mirror);
@@ -2157,8 +2157,7 @@ static int bio_readpage_error(struct bio *failed_bio, struct page *page, 
		 * clean_io_failure() clean all those errors at once.

		 */

	}

	num_copies = btrfs_num_copies(

			      &BTRFS_I(inode)->root->fs_info->mapping_tree,

	num_copies = btrfs_num_copies(BTRFS_I(inode)->root->fs_info,

				      failrec->logical, failrec->len);

	if (num_copies == 1) {

		/*

fs/btrfs/volumes.c

+2 −1
Original line number Diff line number Diff line
@@ -3785,8 +3785,9 @@ void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree) 
	}

}



int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len)

int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)

{

	struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree;

	struct extent_map *em;

	struct map_lookup *map;

	struct extent_map_tree *em_tree = &map_tree->map_tree;

fs/btrfs/volumes.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ int btrfs_add_device(struct btrfs_trans_handle *trans, 
		     struct btrfs_device *device);

int btrfs_rm_device(struct btrfs_root *root, char *device_path);

void btrfs_cleanup_fs_uuids(void);

int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len);

int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len);

int btrfs_grow_device(struct btrfs_trans_handle *trans,

		      struct btrfs_device *device, u64 new_size);

struct btrfs_device *btrfs_find_device(struct btrfs_root *root, u64 devid,