Commit 41b75742 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: bsg: Pass dev to blk_mq_alloc_queue() 



When calling bsg_setup_queue() -> blk_mq_alloc_queue(), we don't pass
the dev as the queuedata, but rather manually set it afterwards. Just
pass dev to blk_mq_alloc_queue() to have automatically set.

Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20240524084829.2132555-3-john.g.garry@oracle.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e7c09df1

block/bsg-lib.c

+1 −2
Original line number Diff line number Diff line
@@ -385,13 +385,12 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name, 
	if (blk_mq_alloc_tag_set(set))

		goto out_tag_set;



	q = blk_mq_alloc_queue(set, lim, NULL);

	q = blk_mq_alloc_queue(set, lim, dev);

	if (IS_ERR(q)) {

		ret = PTR_ERR(q);

		goto out_queue;

	}



	q->queuedata = dev;

	blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);



	bset->bd = bsg_register_queue(q, dev, name, bsg_transport_sg_io_fn);