Commit 309dca30 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: store a block_device pointer in struct bio 



Replace the gendisk pointer in struct bio with a pointer to the newly
improved struct block device.  From that the gendisk can be trivially
accessed with an extra indirection, but it also allows to directly
look up all information related to partition remapping.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cf9a978f

arch/m68k/emu/nfblock.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct nfhd_device { 


static blk_qc_t nfhd_submit_bio(struct bio *bio)

{

	struct nfhd_device *dev = bio->bi_disk->private_data;

	struct nfhd_device *dev = bio->bi_bdev->bd_disk->private_data;

	struct bio_vec bvec;

	struct bvec_iter iter;

	int dir, len, shift;

arch/xtensa/platforms/iss/simdisk.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector, 


static blk_qc_t simdisk_submit_bio(struct bio *bio)

{

	struct simdisk *dev = bio->bi_disk->private_data;

	struct simdisk *dev = bio->bi_bdev->bd_disk->private_data;

	struct bio_vec bvec;

	struct bvec_iter iter;

	sector_t sector = bio->bi_iter.bi_sector;

block/bio-integrity.c

+9 −9
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, 
	iv = bip->bip_vec + bip->bip_vcnt;



	if (bip->bip_vcnt &&

	    bvec_gap_to_prev(bio->bi_disk->queue,

	    bvec_gap_to_prev(bio->bi_bdev->bd_disk->queue,

			     &bip->bip_vec[bip->bip_vcnt - 1], offset))

		return 0;
@@ -162,7 +162,7 @@ EXPORT_SYMBOL(bio_integrity_add_page); 
static blk_status_t bio_integrity_process(struct bio *bio,

		struct bvec_iter *proc_iter, integrity_processing_fn *proc_fn)

{

	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	struct blk_integrity_iter iter;

	struct bvec_iter bviter;

	struct bio_vec bv;
@@ -171,7 +171,7 @@ static blk_status_t bio_integrity_process(struct bio *bio, 
	void *prot_buf = page_address(bip->bip_vec->bv_page) +

		bip->bip_vec->bv_offset;



	iter.disk_name = bio->bi_disk->disk_name;

	iter.disk_name = bio->bi_bdev->bd_disk->disk_name;

	iter.interval = 1 << bi->interval_exp;

	iter.seed = proc_iter->bi_sector;

	iter.prot_buf = prot_buf;
@@ -208,8 +208,8 @@ static blk_status_t bio_integrity_process(struct bio *bio, 
bool bio_integrity_prep(struct bio *bio)

{

	struct bio_integrity_payload *bip;

	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);

	struct request_queue *q = bio->bi_disk->queue;

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	struct request_queue *q = bio->bi_bdev->bd_disk->queue;

	void *buf;

	unsigned long start, end;

	unsigned int len, nr_pages;
@@ -329,7 +329,7 @@ static void bio_integrity_verify_fn(struct work_struct *work) 
	struct bio_integrity_payload *bip =

		container_of(work, struct bio_integrity_payload, bip_work);

	struct bio *bio = bip->bip_bio;

	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);



	/*

	 * At the moment verify is called bio's iterator was advanced
@@ -355,7 +355,7 @@ static void bio_integrity_verify_fn(struct work_struct *work) 
 */

bool __bio_integrity_endio(struct bio *bio)

{

	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	struct bio_integrity_payload *bip = bio_integrity(bio);



	if (bio_op(bio) == REQ_OP_READ && !bio->bi_status &&
@@ -381,7 +381,7 @@ bool __bio_integrity_endio(struct bio *bio) 
void bio_integrity_advance(struct bio *bio, unsigned int bytes_done)

{

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	unsigned bytes = bio_integrity_bytes(bi, bytes_done >> 9);



	bip->bip_iter.bi_sector += bytes_done >> 9;
@@ -397,7 +397,7 @@ void bio_integrity_advance(struct bio *bio, unsigned int bytes_done) 
void bio_integrity_trim(struct bio *bio)

{

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);



	bip->bip_iter.bi_size = bio_integrity_bytes(bi, bio_sectors(bio));

}

block/bio.c

+11 −20
Original line number Diff line number Diff line
@@ -607,16 +607,7 @@ void bio_truncate(struct bio *bio, unsigned new_size) 
 */

void guard_bio_eod(struct bio *bio)

{

	sector_t maxsector;

	struct block_device *part;



	rcu_read_lock();

	part = __disk_get_part(bio->bi_disk, bio->bi_partno);

	if (part)

		maxsector = bdev_nr_sectors(part);

	else	

		maxsector = get_capacity(bio->bi_disk);

	rcu_read_unlock();

	sector_t maxsector = bdev_nr_sectors(bio->bi_bdev);



	if (!maxsector)

		return;
@@ -676,11 +667,10 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) 
	BUG_ON(bio->bi_pool && BVEC_POOL_IDX(bio));



	/*

	 * most users will be overriding ->bi_disk with a new target,

	 * most users will be overriding ->bi_bdev with a new target,

	 * so we don't set nor calculate new physical/hw segment counts here

	 */

	bio->bi_disk = bio_src->bi_disk;

	bio->bi_partno = bio_src->bi_partno;

	bio->bi_bdev = bio_src->bi_bdev;

	bio_set_flag(bio, BIO_CLONED);

	if (bio_flagged(bio_src, BIO_THROTTLED))

		bio_set_flag(bio, BIO_THROTTLED);
@@ -730,7 +720,7 @@ EXPORT_SYMBOL(bio_clone_fast); 


const char *bio_devname(struct bio *bio, char *buf)

{

	return disk_name(bio->bi_disk, bio->bi_partno, buf);

	return bdevname(bio->bi_bdev, buf);

}

EXPORT_SYMBOL(bio_devname);
@@ -1037,7 +1027,7 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter) 
{

	unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt;

	unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;

	struct request_queue *q = bio->bi_disk->queue;

	struct request_queue *q = bio->bi_bdev->bd_disk->queue;

	unsigned int max_append_sectors = queue_max_zone_append_sectors(q);

	struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;

	struct page **pages = (struct page **)bv;
@@ -1145,7 +1135,8 @@ static void submit_bio_wait_endio(struct bio *bio) 
 */

int submit_bio_wait(struct bio *bio)

{

	DECLARE_COMPLETION_ONSTACK_MAP(done, bio->bi_disk->lockdep_map);

	DECLARE_COMPLETION_ONSTACK_MAP(done,

			bio->bi_bdev->bd_disk->lockdep_map);

	unsigned long hang_check;



	bio->bi_private = &done;
@@ -1422,8 +1413,8 @@ void bio_endio(struct bio *bio) 
	if (!bio_integrity_endio(bio))

		return;



	if (bio->bi_disk)

		rq_qos_done_bio(bio->bi_disk->queue, bio);

	if (bio->bi_bdev)

		rq_qos_done_bio(bio->bi_bdev->bd_disk->queue, bio);



	/*

	 * Need to have a real endio function for chained bios, otherwise
@@ -1438,8 +1429,8 @@ void bio_endio(struct bio *bio) 
		goto again;

	}



	if (bio->bi_disk && bio_flagged(bio, BIO_TRACE_COMPLETION)) {

		trace_block_bio_complete(bio->bi_disk->queue, bio);

	if (bio->bi_bdev && bio_flagged(bio, BIO_TRACE_COMPLETION)) {

		trace_block_bio_complete(bio->bi_bdev->bd_disk->queue, bio);

		bio_clear_flag(bio, BIO_TRACE_COMPLETION);

	}

block/blk-cgroup.c

+4 −3
Original line number Diff line number Diff line
@@ -1800,7 +1800,8 @@ static inline struct blkcg_gq *blkg_tryget_closest(struct bio *bio, 
	struct blkcg_gq *blkg, *ret_blkg = NULL;



	rcu_read_lock();

	blkg = blkg_lookup_create(css_to_blkcg(css), bio->bi_disk->queue);

	blkg = blkg_lookup_create(css_to_blkcg(css),

				  bio->bi_bdev->bd_disk->queue);

	while (blkg) {

		if (blkg_tryget(blkg)) {

			ret_blkg = blkg;
@@ -1836,8 +1837,8 @@ void bio_associate_blkg_from_css(struct bio *bio, 
	if (css && css->parent) {

		bio->bi_blkg = blkg_tryget_closest(bio, css);

	} else {

		blkg_get(bio->bi_disk->queue->root_blkg);

		bio->bi_blkg = bio->bi_disk->queue->root_blkg;

		blkg_get(bio->bi_bdev->bd_disk->queue->root_blkg);

		bio->bi_blkg = bio->bi_bdev->bd_disk->queue->root_blkg;

	}

}

EXPORT_SYMBOL_GPL(bio_associate_blkg_from_css);