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

Commit b3d3fa51 authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

btrfs: update __btrfs_map_block for REQ_OP transition 



We no longer pass in a bitmap of rq_flag_bits bits to __btrfs_map_block.
It will always be a REQ_OP, or the btrfs specific REQ_GET_READ_MIRRORS,
so this drops the bit tests.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 37226b21

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -2048,7 +2048,7 @@ int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr, 
	 */

	btrfs_bio_counter_inc_blocked(root->fs_info);

	/* Tell the block device(s) that the sectors can be discarded */

	ret = btrfs_map_block(root->fs_info, REQ_DISCARD,

	ret = btrfs_map_block(root->fs_info, REQ_OP_DISCARD,

			      bytenr, &num_bytes, &bbio, 0);

	/* Error condition is -ENOMEM */

	if (!ret) {

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset, 


	length = bio->bi_iter.bi_size;

	map_length = length;

	ret = btrfs_map_block(root->fs_info, rw, logical,

	ret = btrfs_map_block(root->fs_info, bio_op(bio), logical,

			      &map_length, NULL, 0);

	/* Will always return 0 with map_multi == NULL */

	BUG_ON(ret < 0);

fs/btrfs/volumes.c

+30 −25
Original line number Diff line number Diff line
@@ -5259,7 +5259,7 @@ void btrfs_put_bbio(struct btrfs_bio *bbio) 
		kfree(bbio);

}



static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,

static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int op,

			     u64 logical, u64 *length,

			     struct btrfs_bio **bbio_ret,

			     int mirror_num, int need_raid_map)
@@ -5345,7 +5345,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
		raid56_full_stripe_start *= full_stripe_len;

	}



	if (rw & REQ_DISCARD) {

	if (op == REQ_OP_DISCARD) {

		/* we don't discard raid56 yet */

		if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) {

			ret = -EOPNOTSUPP;
@@ -5358,7 +5358,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
		   For other RAID types and for RAID[56] reads, just allow a single

		   stripe (on a single disk). */

		if ((map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) &&

		    (rw & REQ_WRITE)) {

		    (op == REQ_OP_WRITE)) {

			max_len = stripe_len * nr_data_stripes(map) -

				(offset - raid56_full_stripe_start);

		} else {
@@ -5383,8 +5383,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
		btrfs_dev_replace_set_lock_blocking(dev_replace);



	if (dev_replace_is_ongoing && mirror_num == map->num_stripes + 1 &&

	    !(rw & (REQ_WRITE | REQ_DISCARD | REQ_GET_READ_MIRRORS)) &&

	    dev_replace->tgtdev != NULL) {

	    op != REQ_OP_WRITE && op != REQ_OP_DISCARD &&

	    op != REQ_GET_READ_MIRRORS && dev_replace->tgtdev != NULL) {

		/*

		 * in dev-replace case, for repair case (that's the only

		 * case where the mirror is selected explicitly when
@@ -5471,15 +5471,17 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
			    (offset + *length);



	if (map->type & BTRFS_BLOCK_GROUP_RAID0) {

		if (rw & REQ_DISCARD)

		if (op == REQ_OP_DISCARD)

			num_stripes = min_t(u64, map->num_stripes,

					    stripe_nr_end - stripe_nr_orig);

		stripe_nr = div_u64_rem(stripe_nr, map->num_stripes,

				&stripe_index);

		if (!(rw & (REQ_WRITE | REQ_DISCARD | REQ_GET_READ_MIRRORS)))

		if (op != REQ_OP_WRITE && op != REQ_OP_DISCARD &&

		    op != REQ_GET_READ_MIRRORS)

			mirror_num = 1;

	} else if (map->type & BTRFS_BLOCK_GROUP_RAID1) {

		if (rw & (REQ_WRITE | REQ_DISCARD | REQ_GET_READ_MIRRORS))

		if (op == REQ_OP_WRITE || op == REQ_OP_DISCARD ||

		    op == REQ_GET_READ_MIRRORS)

			num_stripes = map->num_stripes;

		else if (mirror_num)

			stripe_index = mirror_num - 1;
@@ -5492,7 +5494,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
		}



	} else if (map->type & BTRFS_BLOCK_GROUP_DUP) {

		if (rw & (REQ_WRITE | REQ_DISCARD | REQ_GET_READ_MIRRORS)) {

		if (op == REQ_OP_WRITE || REQ_OP_DISCARD ||

		    op == REQ_GET_READ_MIRRORS) {

			num_stripes = map->num_stripes;

		} else if (mirror_num) {

			stripe_index = mirror_num - 1;
@@ -5506,9 +5509,9 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
		stripe_nr = div_u64_rem(stripe_nr, factor, &stripe_index);

		stripe_index *= map->sub_stripes;



		if (rw & (REQ_WRITE | REQ_GET_READ_MIRRORS))

		if (op == REQ_OP_WRITE || op == REQ_GET_READ_MIRRORS)

			num_stripes = map->sub_stripes;

		else if (rw & REQ_DISCARD)

		else if (op == REQ_OP_DISCARD)

			num_stripes = min_t(u64, map->sub_stripes *

					    (stripe_nr_end - stripe_nr_orig),

					    map->num_stripes);
@@ -5526,7 +5529,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 


	} else if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) {

		if (need_raid_map &&

		    ((rw & (REQ_WRITE | REQ_GET_READ_MIRRORS)) ||

		    (op == REQ_OP_WRITE || op == REQ_GET_READ_MIRRORS ||

		     mirror_num > 1)) {

			/* push stripe_nr back to the start of the full stripe */

			stripe_nr = div_u64(raid56_full_stripe_start,
@@ -5554,8 +5557,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
			/* We distribute the parity blocks across stripes */

			div_u64_rem(stripe_nr + stripe_index, map->num_stripes,

					&stripe_index);

			if (!(rw & (REQ_WRITE | REQ_DISCARD |

				    REQ_GET_READ_MIRRORS)) && mirror_num <= 1)

			if ((op != REQ_OP_WRITE && op != REQ_OP_DISCARD &&

			    op != REQ_GET_READ_MIRRORS) && mirror_num <= 1)

				mirror_num = 1;

		}

	} else {
@@ -5578,9 +5581,9 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 


	num_alloc_stripes = num_stripes;

	if (dev_replace_is_ongoing) {

		if (rw & (REQ_WRITE | REQ_DISCARD))

		if (op == REQ_OP_WRITE || op == REQ_OP_DISCARD)

			num_alloc_stripes <<= 1;

		if (rw & REQ_GET_READ_MIRRORS)

		if (op == REQ_GET_READ_MIRRORS)

			num_alloc_stripes++;

		tgtdev_indexes = num_stripes;

	}
@@ -5595,7 +5598,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 


	/* build raid_map */

	if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK &&

	    need_raid_map && ((rw & (REQ_WRITE | REQ_GET_READ_MIRRORS)) ||

	    need_raid_map &&

	    ((op == REQ_OP_WRITE || op == REQ_GET_READ_MIRRORS) ||

	    mirror_num > 1)) {

		u64 tmp;

		unsigned rot;
@@ -5620,7 +5624,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
				RAID6_Q_STRIPE;

	}



	if (rw & REQ_DISCARD) {

	if (op == REQ_OP_DISCARD) {

		u32 factor = 0;

		u32 sub_stripes = 0;

		u64 stripes_per_dev = 0;
@@ -5700,14 +5704,15 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
		}

	}



	if (rw & (REQ_WRITE | REQ_GET_READ_MIRRORS))

	if (op == REQ_OP_WRITE || op == REQ_GET_READ_MIRRORS)

		max_errors = btrfs_chunk_max_errors(map);



	if (bbio->raid_map)

		sort_parity_stripes(bbio, num_stripes);



	tgtdev_indexes = 0;

	if (dev_replace_is_ongoing && (rw & (REQ_WRITE | REQ_DISCARD)) &&

	if (dev_replace_is_ongoing &&

	   (op == REQ_OP_WRITE || op == REQ_OP_DISCARD) &&

	    dev_replace->tgtdev != NULL) {

		int index_where_to_add;

		u64 srcdev_devid = dev_replace->srcdev->devid;
@@ -5742,7 +5747,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
			}

		}

		num_stripes = index_where_to_add;

	} else if (dev_replace_is_ongoing && (rw & REQ_GET_READ_MIRRORS) &&

	} else if (dev_replace_is_ongoing && (op == REQ_GET_READ_MIRRORS) &&

		   dev_replace->tgtdev != NULL) {

		u64 srcdev_devid = dev_replace->srcdev->devid;

		int index_srcdev = 0;
@@ -5814,21 +5819,21 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
	return ret;

}



int btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,

int btrfs_map_block(struct btrfs_fs_info *fs_info, int op,

		      u64 logical, u64 *length,

		      struct btrfs_bio **bbio_ret, int mirror_num)

{

	return __btrfs_map_block(fs_info, rw, logical, length, bbio_ret,

	return __btrfs_map_block(fs_info, op, logical, length, bbio_ret,

				 mirror_num, 0);

}



/* For Scrub/replace */

int btrfs_map_sblock(struct btrfs_fs_info *fs_info, int rw,

int btrfs_map_sblock(struct btrfs_fs_info *fs_info, int op,

		     u64 logical, u64 *length,

		     struct btrfs_bio **bbio_ret, int mirror_num,

		     int need_raid_map)

{

	return __btrfs_map_block(fs_info, rw, logical, length, bbio_ret,

	return __btrfs_map_block(fs_info, op, logical, length, bbio_ret,

				 mirror_num, need_raid_map);

}

fs/btrfs/volumes.h

+2 −2
Original line number Diff line number Diff line
@@ -375,10 +375,10 @@ int btrfs_account_dev_extents_size(struct btrfs_device *device, u64 start, 
				   u64 end, u64 *length);

void btrfs_get_bbio(struct btrfs_bio *bbio);

void btrfs_put_bbio(struct btrfs_bio *bbio);

int btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,

int btrfs_map_block(struct btrfs_fs_info *fs_info, int op,

		    u64 logical, u64 *length,

		    struct btrfs_bio **bbio_ret, int mirror_num);

int btrfs_map_sblock(struct btrfs_fs_info *fs_info, int rw,

int btrfs_map_sblock(struct btrfs_fs_info *fs_info, int op,

		     u64 logical, u64 *length,

		     struct btrfs_bio **bbio_ret, int mirror_num,

		     int need_raid_map);