| Message ID | 20240215070300.2200308-4-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/17] ubd: pass queue_limits to blk_mq_alloc_disk | expand |
Hello, On 2/15/24 11:02, Christoph Hellwig wrote: > 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> > --- > drivers/block/floppy.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Denis Efremov <efremov@linux.com> > > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c > index 582cf50c6bf6b8..1b399ec8c07d1e 100644 > --- a/drivers/block/floppy.c > +++ b/drivers/block/floppy.c > @@ -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;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 582cf50c6bf6b8..1b399ec8c07d1e 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -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;
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> --- drivers/block/floppy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)