Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26318571 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: add proper discard setup for the multipath device 



Add a gendisk argument to nvme_config_discard 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>
Reported-by: default avatarSagi Grimberg <sagi@grimberg.me>
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 b1aafb35

drivers/nvme/host/core.c

+3 −3
Original line number Diff line number Diff line
@@ -1495,10 +1495,10 @@ static void nvme_set_chunk_size(struct nvme_ns *ns) 
	blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(chunk_size));

}



static void nvme_config_discard(struct nvme_ns *ns)

static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)

{

	struct nvme_ctrl *ctrl = ns->ctrl;

	struct request_queue *queue = ns->queue;

	struct request_queue *queue = disk->queue;

	u32 size = queue_logical_block_size(queue);



	if (!(ctrl->oncs & NVME_CTRL_ONCS_DSM)) {
@@ -1606,7 +1606,7 @@ static void nvme_update_disk_info(struct gendisk *disk, 


	set_capacity(disk, capacity);



	nvme_config_discard(ns);

	nvme_config_discard(disk, ns);

	nvme_config_write_zeroes(ns);



	if (id->nsattr & (1 << 0))