diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-05 11:12:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-05 11:12:34 -0700 |
| commit | 060a72a268577cf27733d9e8eb03b3ca427f45e6 (patch) | |
| tree | 678e856f5de82a5ef5401e01e6d36725611e88d9 /drivers/nvme | |
| parent | MAINTAINERS: update phylink/sfp keyword matching (diff) | |
| parent | block: don't do revalidate zones on invalid devices (diff) | |
| download | wireguard-linux-060a72a268577cf27733d9e8eb03b3ca427f45e6.tar.xz wireguard-linux-060a72a268577cf27733d9e8eb03b3ca427f45e6.zip | |
Merge tag 'for-5.9/block-merge-20200804' of git://git.kernel.dk/linux-block
Pull block stacking updates from Jens Axboe:
"The stacking related fixes depended on both the core block and drivers
branches, so here's a topic branch with that change.
Outside of that, a late fix from Johannes for zone revalidation"
* tag 'for-5.9/block-merge-20200804' of git://git.kernel.dk/linux-block:
block: don't do revalidate zones on invalid devices
block: remove blk_queue_stack_limits
block: remove bdev_stack_limits
block: inherit the zoned characteristics in blk_stack_limits
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 767d62985bba..88cff309d8e4 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2081,7 +2081,8 @@ static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) #ifdef CONFIG_NVME_MULTIPATH if (ns->head->disk) { nvme_update_disk_info(ns->head->disk, ns, id); - blk_queue_stack_limits(ns->head->disk->queue, ns->queue); + blk_stack_limits(&ns->head->disk->queue->limits, + &ns->queue->limits, 0); nvme_mpath_update_disk_size(ns->head->disk); } #endif |