diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-06-19 17:02:34 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-06-19 17:14:49 +0300 |
| commit | 69c34f07e45f2d52d9a41991867a1e5a85bbaaf3 (patch) | |
| tree | dc4779c7ed7a5f17ddf67182399111815da27100 /drivers/block/amiflop.c | |
| parent | 465478bb00168a7620788990b1679c5067d421f2 (diff) | |
| parent | 339d3948c07b4aa2940aeb874294a7d6782cec16 (diff) | |
| download | linux-69c34f07e45f2d52d9a41991867a1e5a85bbaaf3.tar.xz | |
Merge branch 'for-6.11/block-limits' into for-6.11/block
Merge in last round of queue limits changes from Christoph.
* for-6.11/block-limits: (26 commits)
block: move the bounce flag into the features field
block: move the skip_tagset_quiesce flag to queue_limits
block: move the pci_p2pdma flag to queue_limits
block: move the zone_resetall flag to queue_limits
block: move the zoned flag into the features field
block: move the poll flag to queue_limits
block: move the dax flag to queue_limits
block: move the nowait flag to queue_limits
block: move the synchronous flag to queue_limits
block: move the stable_writes flag to queue_limits
block: move the io_stat flag setting to queue_limits
block: move the add_random flag to queue_limits
block: move the nonrot flag to queue_limits
block: move cache control settings out of queue->flags
block: remove blk_flush_policy
block: freeze the queue in queue_attr_store
nbd: move setting the cache control flags to __nbd_set_size
virtio_blk: remove virtblk_update_cache_mode
loop: fold loop_update_rotational into loop_reconfigure_limits
loop: also use the default block size from an underlying block device
...
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/amiflop.c')
| -rw-r--r-- | drivers/block/amiflop.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 310254c994aa..49ced65bef4c 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -1777,10 +1777,13 @@ static const struct blk_mq_ops amiflop_mq_ops = { static int fd_alloc_disk(int drive, int system) { + struct queue_limits lim = { + .features = BLK_FEAT_ROTATIONAL, + }; struct gendisk *disk; int err; - disk = blk_mq_alloc_disk(&unit[drive].tag_set, NULL, NULL); + disk = blk_mq_alloc_disk(&unit[drive].tag_set, &lim, NULL); if (IS_ERR(disk)) return PTR_ERR(disk); |