mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
block: replace bi_bdev with a gendisk pointer and partitions index
This way we don't need a block_device structure to submit I/O. The block_device has different life time rules from the gendisk and request_queue and is usually only available when the block device node is open. Other callers need to explicitly create one (e.g. the lightnvm passthrough code, or the new nvme multipathing code). For the actual I/O path all that we need is the gendisk, which exists once per block device. But given that the block layer also does partition remapping we additionally need a partition index, which is used for said remapping in generic_make_request. Note that all the block drivers generally want request_queue or sometimes the gendisk, so this removes a layer of indirection all over the stack. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
c2ee070fb0
commit
74d46992e0
99 changed files with 358 additions and 357 deletions
|
|
@ -111,7 +111,7 @@ struct dio {
|
|||
int op;
|
||||
int op_flags;
|
||||
blk_qc_t bio_cookie;
|
||||
struct block_device *bio_bdev;
|
||||
struct gendisk *bio_disk;
|
||||
struct inode *inode;
|
||||
loff_t i_size; /* i_size when submitted */
|
||||
dio_iodone_t *end_io; /* IO completion function */
|
||||
|
|
@ -377,7 +377,7 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,
|
|||
*/
|
||||
bio = bio_alloc(GFP_KERNEL, nr_vecs);
|
||||
|
||||
bio->bi_bdev = bdev;
|
||||
bio_set_dev(bio, bdev);
|
||||
bio->bi_iter.bi_sector = first_sector;
|
||||
bio_set_op_attrs(bio, dio->op, dio->op_flags);
|
||||
if (dio->is_async)
|
||||
|
|
@ -412,7 +412,7 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio)
|
|||
if (dio->is_async && dio->op == REQ_OP_READ && dio->should_dirty)
|
||||
bio_set_pages_dirty(bio);
|
||||
|
||||
dio->bio_bdev = bio->bi_bdev;
|
||||
dio->bio_disk = bio->bi_disk;
|
||||
|
||||
if (sdio->submit_io) {
|
||||
sdio->submit_io(bio, dio->inode, sdio->logical_offset_in_bio);
|
||||
|
|
@ -458,7 +458,7 @@ static struct bio *dio_await_one(struct dio *dio)
|
|||
dio->waiter = current;
|
||||
spin_unlock_irqrestore(&dio->bio_lock, flags);
|
||||
if (!(dio->iocb->ki_flags & IOCB_HIPRI) ||
|
||||
!blk_mq_poll(bdev_get_queue(dio->bio_bdev), dio->bio_cookie))
|
||||
!blk_mq_poll(dio->bio_disk->queue, dio->bio_cookie))
|
||||
io_schedule();
|
||||
/* wake up sets us TASK_RUNNING */
|
||||
spin_lock_irqsave(&dio->bio_lock, flags);
|
||||
|
|
|
|||
Loading…
Reference in a new issue