Commit 1c02fca6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove the request_queue argument to the block_bio_remap tracepoint 



The request_queue can trivially be derived from the bio.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent eb6f7f7c

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static inline int blk_partition_remap(struct bio *bio) 
		if (bio_check_eod(bio, bdev_nr_sectors(p)))

			goto out;

		bio->bi_iter.bi_sector += p->bd_start_sect;

		trace_block_bio_remap(bio->bi_disk->queue, bio, p->bd_dev,

		trace_block_bio_remap(bio, p->bd_dev,

				      bio->bi_iter.bi_sector -

				      p->bd_start_sect);

	}

drivers/md/dm.c

+1 −2
Original line number Diff line number Diff line
@@ -1276,8 +1276,7 @@ static blk_qc_t __map_bio(struct dm_target_io *tio) 
		break;

	case DM_MAPIO_REMAPPED:

		/* the bio has been remapped so dispatch it */

		trace_block_bio_remap(clone->bi_disk->queue, clone,

				      bio_dev(io->orig_bio), sector);

		trace_block_bio_remap(clone, bio_dev(io->orig_bio), sector);

		ret = submit_bio_noacct(clone);

		break;

	case DM_MAPIO_KILL:

drivers/md/md-linear.c

+1 −2
Original line number Diff line number Diff line
@@ -257,8 +257,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio) 
		bio_endio(bio);

	} else {

		if (mddev->gendisk)

			trace_block_bio_remap(bio->bi_disk->queue,

					      bio, disk_devt(mddev->gendisk),

			trace_block_bio_remap(bio, disk_devt(mddev->gendisk),

					      bio_sector);

		mddev_check_writesame(mddev, bio);

		mddev_check_write_zeroes(mddev, bio);

drivers/md/md.c

+2 −3
Original line number Diff line number Diff line
@@ -8591,8 +8591,7 @@ void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev, 
	bio_chain(discard_bio, bio);

	bio_clone_blkg_association(discard_bio, bio);

	if (mddev->gendisk)

		trace_block_bio_remap(bdev_get_queue(rdev->bdev),

			discard_bio, disk_devt(mddev->gendisk),

		trace_block_bio_remap(discard_bio, disk_devt(mddev->gendisk),

				      bio->bi_iter.bi_sector);

	submit_bio_noacct(discard_bio);

}

drivers/md/raid0.c

+2 −2
Original line number Diff line number Diff line
@@ -571,8 +571,8 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio) 
		tmp_dev->data_offset;



	if (mddev->gendisk)

		trace_block_bio_remap(bio->bi_disk->queue, bio,

				disk_devt(mddev->gendisk), bio_sector);

		trace_block_bio_remap(bio, disk_devt(mddev->gendisk),

				      bio_sector);

	mddev_check_writesame(mddev, bio);

	mddev_check_write_zeroes(mddev, bio);

	submit_bio_noacct(bio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE