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

block: remove the ->rq_disk field in struct request 



Just use the disk attached to the request_queue instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20211126121802.2090656-4-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 79bb1dbd

block/blk-flush.c

+1 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void blk_flush_queue_rq(struct request *rq, bool add_front) 


static void blk_account_io_flush(struct request *rq)

{

	struct block_device *part = rq->rq_disk->part0;

	struct block_device *part = rq->q->disk->part0;



	part_stat_lock();

	part_stat_inc(part, ios[STAT_FLUSH]);
@@ -339,7 +339,6 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq, 
	flush_rq->cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH;

	flush_rq->cmd_flags |= (flags & REQ_DRV) | (flags & REQ_FAILFAST_MASK);

	flush_rq->rq_flags |= RQF_FLUSH_SEQ;

	flush_rq->rq_disk = first_rq->rq_disk;

	flush_rq->end_io = flush_end_io;

	/*

	 * Order WRITE ->end_io and WRITE rq->ref, and its pair is the one

block/blk-mq.c

+6 −8
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, 
		rq->start_time_ns = ktime_get_ns();

	else

		rq->start_time_ns = 0;

	rq->rq_disk = NULL;

	rq->part = NULL;

#ifdef CONFIG_BLK_RQ_ALLOC_TIME

	rq->alloc_time_ns = alloc_time_ns;
@@ -659,7 +658,7 @@ void blk_mq_free_plug_rqs(struct blk_plug *plug) 
void blk_dump_rq_flags(struct request *rq, char *msg)

{

	printk(KERN_INFO "%s: dev %s: flags=%llx\n", msg,

		rq->rq_disk ? rq->rq_disk->disk_name : "?",

		rq->q->disk ? rq->q->disk->disk_name : "?",

		(unsigned long long) rq->cmd_flags);



	printk(KERN_INFO "  sector %llu, nr/cnr %u/%u\n",
@@ -712,7 +711,7 @@ static void blk_print_req_error(struct request *req, blk_status_t status) 
		"%s error, dev %s, sector %llu op 0x%x:(%s) flags 0x%x "

		"phys_seg %u prio class %u\n",

		blk_status_to_str(status),

		req->rq_disk ? req->rq_disk->disk_name : "?",

		req->q->disk ? req->q->disk->disk_name : "?",

		blk_rq_pos(req), req_op(req), blk_op_str(req_op(req)),

		req->cmd_flags & ~REQ_OP_MASK,

		req->nr_phys_segments,
@@ -853,8 +852,8 @@ static void __blk_account_io_start(struct request *rq) 
	/* passthrough requests can hold bios that do not have ->bi_bdev set */

	if (rq->bio && rq->bio->bi_bdev)

		rq->part = rq->bio->bi_bdev;

	else

		rq->part = rq->rq_disk->part0;

	else if (rq->q->disk)

		rq->part = rq->q->disk->part0;



	part_stat_lock();

	update_io_ticks(rq->part, jiffies, false);
@@ -1172,7 +1171,6 @@ void blk_execute_rq_nowait(struct gendisk *bd_disk, struct request *rq, 
	WARN_ON(irqs_disabled());

	WARN_ON(!blk_rq_is_passthrough(rq));



	rq->rq_disk = bd_disk;

	rq->end_io = done;



	blk_account_io_start(rq);
@@ -2902,8 +2900,8 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request * 
	if (ret != BLK_STS_OK)

		return ret;



	if (rq->rq_disk &&

	    should_fail_request(rq->rq_disk->part0, blk_rq_bytes(rq)))

	if (rq->q->disk &&

	    should_fail_request(rq->q->disk->part0, blk_rq_bytes(rq)))

		return BLK_STS_IOERR;



	if (blk_crypto_insert_cloned_request(rq))

block/blk.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int blk_dev_init(void); 
 */

static inline bool blk_do_io_stat(struct request *rq)

{

	return (rq->rq_flags & RQF_IO_STAT) && rq->rq_disk;

	return (rq->rq_flags & RQF_IO_STAT) && rq->q->disk;

}



void update_io_ticks(struct block_device *part, unsigned long now, bool end);

drivers/block/amiflop.c

+1 −1
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ static blk_status_t amiflop_queue_rq(struct blk_mq_hw_ctx *hctx, 
				     const struct blk_mq_queue_data *bd)

{

	struct request *rq = bd->rq;

	struct amiga_floppy_struct *floppy = rq->rq_disk->private_data;

	struct amiga_floppy_struct *floppy = rq->q->disk->private_data;

	blk_status_t err;



	if (!spin_trylock_irq(&amiflop_lock))

drivers/block/ataflop.c

+3 −3
Original line number Diff line number Diff line
@@ -1502,7 +1502,7 @@ static void setup_req_params( int drive ) 
static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,

				     const struct blk_mq_queue_data *bd)

{

	struct atari_floppy_struct *floppy = bd->rq->rq_disk->private_data;

	struct atari_floppy_struct *floppy = bd->rq->q->disk->private_data;

	int drive = floppy - unit;

	int type = floppy->type;
@@ -1538,7 +1538,7 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx, 
		if (!UDT) {

			Probing = 1;

			UDT = atari_disk_type + StartDiskType[DriveType];

			set_capacity(bd->rq->rq_disk, UDT->blocks);

			set_capacity(bd->rq->q->disk, UDT->blocks);

			UD.autoprobe = 1;

		}

	}
@@ -1558,7 +1558,7 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx, 
		}

		type = minor2disktype[type].index;

		UDT = &atari_disk_type[type];

		set_capacity(bd->rq->rq_disk, UDT->blocks);

		set_capacity(bd->rq->q->disk, UDT->blocks);

		UD.autoprobe = 0;

	}