nfblock: pass queue_limits to blk_mq_alloc_disk

Pass the queue limits directly to blk_alloc_disk instead of setting them
one at a time.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Link: https://lore.kernel.org/r/20240215071055.2201424-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index 539ff56b6968d0cb1a22fab2f61f1cc5f8014df4..642fb80c5c4e31f6c595e1663a19d7760c68e1e1 100644 (file)
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -96,6 +96,9 @@ static const struct block_device_operations nfhd_ops = {
 
 static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
 {
+       struct queue_limits lim = {
+               .logical_block_size     = bsize,
+       };
        struct nfhd_device *dev;
        int dev_id = id - NFHD_DEV_OFFSET;
        int err = -ENOMEM;
@@ -117,7 +120,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
        dev->bsize = bsize;
        dev->bshift = ffs(bsize) - 10;
 
-       dev->disk = blk_alloc_disk(NULL, NUMA_NO_NODE);
+       dev->disk = blk_alloc_disk(&lim, NUMA_NO_NODE);
        if (IS_ERR(dev->disk)) {
                err = PTR_ERR(dev->disk);
                goto free_dev;
@@ -130,7 +133,6 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
        dev->disk->private_data = dev;
        sprintf(dev->disk->disk_name, "nfhd%u", dev_id);
        set_capacity(dev->disk, (sector_t)blocks * (bsize / 512));
-       blk_queue_logical_block_size(dev->disk->queue, bsize);
        err = add_disk(dev->disk);
        if (err)
                goto out_cleanup_disk;