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

ps3disk: pass queue_limits to blk_mq_alloc_disk 



Pass the few limits ps3disk imposes directly to blk_mq_alloc_disk instead
of setting them one at a time.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240215070300.2200308-7-hch@lst.de


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

drivers/block/ps3disk.c

+9 −8
Original line number Diff line number Diff line
@@ -382,6 +382,14 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) 
	struct ps3disk_private *priv;

	int error;

	unsigned int devidx;

	struct queue_limits lim = {

		.logical_block_size	= dev->blk_size,

		.max_hw_sectors		= dev->bounce_size >> 9,

		.max_segments		= -1,

		.max_segment_size	= dev->bounce_size,

		.dma_alignment		= dev->blk_size - 1,

	};



	struct request_queue *queue;

	struct gendisk *gendisk;
@@ -431,7 +439,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) 
	if (error)

		goto fail_teardown;



	gendisk = blk_mq_alloc_disk(&priv->tag_set, NULL, dev);

	gendisk = blk_mq_alloc_disk(&priv->tag_set, &lim, dev);

	if (IS_ERR(gendisk)) {

		dev_err(&dev->sbd.core, "%s:%u: blk_mq_alloc_disk failed\n",

			__func__, __LINE__);
@@ -441,15 +449,8 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) 


	queue = gendisk->queue;



	blk_queue_max_hw_sectors(queue, dev->bounce_size >> 9);

	blk_queue_dma_alignment(queue, dev->blk_size-1);

	blk_queue_logical_block_size(queue, dev->blk_size);



	blk_queue_write_cache(queue, true, false);



	blk_queue_max_segments(queue, -1);

	blk_queue_max_segment_size(queue, dev->bounce_size);



	priv->gendisk = gendisk;

	gendisk->major = ps3disk_major;

	gendisk->first_minor = devidx * PS3DISK_MINORS;