mirror of
https://github.com/torvalds/linux.git
synced 2026-04-25 18:12:26 -04:00
s390/dasd: use blk_mq_alloc_disk
As far as I can tell there is no need for the staged setup in dasd, so allocate the tagset and the disk with the queue in dasd_gendisk_alloc. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Stefan Haberland <sth@linux.ibm.com> Signed-off-by: Stefan Haberland <sth@linux.ibm.com> Link: https://lore.kernel.org/r/20220928143945.1687114-2-sth@linux.ibm.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
committed by
Jens Axboe
parent
5765033cf7
commit
c68f4f4e29
@@ -1578,7 +1578,6 @@ dasd_timeout_store(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct dasd_device *device;
|
||||
struct request_queue *q;
|
||||
unsigned long val;
|
||||
|
||||
device = dasd_device_from_cdev(to_ccwdev(dev));
|
||||
@@ -1590,15 +1589,13 @@ dasd_timeout_store(struct device *dev, struct device_attribute *attr,
|
||||
dasd_put_device(device);
|
||||
return -EINVAL;
|
||||
}
|
||||
q = device->block->request_queue;
|
||||
if (!q) {
|
||||
if (!device->block->gdp) {
|
||||
dasd_put_device(device);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
device->blk_timeout = val;
|
||||
|
||||
blk_queue_rq_timeout(q, device->blk_timeout * HZ);
|
||||
blk_queue_rq_timeout(device->block->gdp->queue, val * HZ);
|
||||
|
||||
dasd_put_device(device);
|
||||
return count;
|
||||
|
||||
Reference in New Issue
Block a user