floppy: pass queue_limits to blk_mq_alloc_disk
authorChristoph Hellwig <hch@lst.de>
Thu, 15 Feb 2024 07:02:46 +0000 (08:02 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 19 Feb 2024 23:59:31 +0000 (16:59 -0700)
Pass the few limits floppy imposes directly to blk_mq_alloc_disk instead
of setting them one at a time.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Denis Efremov <efremov@linux.com>
Link: https://lore.kernel.org/r/20240215070300.2200308-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/floppy.c

index 582cf50c6bf6b82b6934420ede6d7adf35679ef9..1b399ec8c07d1e7027a759051b18187dde83ab1e 100644 (file)
@@ -4516,13 +4516,15 @@ static bool floppy_available(int drive)
 
 static int floppy_alloc_disk(unsigned int drive, unsigned int type)
 {
+       struct queue_limits lim = {
+               .max_hw_sectors = 64,
+       };
        struct gendisk *disk;
 
-       disk = blk_mq_alloc_disk(&tag_sets[drive], NULL, NULL);
+       disk = blk_mq_alloc_disk(&tag_sets[drive], &lim, NULL);
        if (IS_ERR(disk))
                return PTR_ERR(disk);
 
-       blk_queue_max_hw_sectors(disk->queue, 64);
        disk->major = FLOPPY_MAJOR;
        disk->first_minor = TOMINOR(drive) | (type << 2);
        disk->minors = 1;