Commit 9f0916ab authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

nvme: add proper write zeroes setup for the multipath device

Add a gendisk argument to nvme_config_write_zeroes so that the call to
nvme_update_disk_info for the multipath device node updates the
proper request_queue.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Tested-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 26318571
...@@ -1526,7 +1526,7 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns) ...@@ -1526,7 +1526,7 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)
blk_queue_max_write_zeroes_sectors(queue, UINT_MAX); blk_queue_max_write_zeroes_sectors(queue, UINT_MAX);
} }
static inline void nvme_config_write_zeroes(struct nvme_ns *ns) static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns)
{ {
u32 max_sectors; u32 max_sectors;
unsigned short bs = 1 << ns->lba_shift; unsigned short bs = 1 << ns->lba_shift;
...@@ -1549,7 +1549,7 @@ static inline void nvme_config_write_zeroes(struct nvme_ns *ns) ...@@ -1549,7 +1549,7 @@ static inline void nvme_config_write_zeroes(struct nvme_ns *ns)
else else
max_sectors = ((u32)(ns->ctrl->max_hw_sectors + 1) * bs) >> 9; max_sectors = ((u32)(ns->ctrl->max_hw_sectors + 1) * bs) >> 9;
blk_queue_max_write_zeroes_sectors(ns->queue, max_sectors); blk_queue_max_write_zeroes_sectors(disk->queue, max_sectors);
} }
static void nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid, static void nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
...@@ -1607,7 +1607,7 @@ static void nvme_update_disk_info(struct gendisk *disk, ...@@ -1607,7 +1607,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
set_capacity(disk, capacity); set_capacity(disk, capacity);
nvme_config_discard(disk, ns); nvme_config_discard(disk, ns);
nvme_config_write_zeroes(ns); nvme_config_write_zeroes(disk, ns);
if (id->nsattr & (1 << 0)) if (id->nsattr & (1 << 0))
set_disk_ro(disk, true); set_disk_ro(disk, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment