diff options
author | David Disseldorp <ddiss@suse.de> | 2017-11-24 16:30:53 +0100 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2017-12-15 15:13:32 +0100 |
commit | b224f6134d72e3493a023b5bea917f9a6beea0c8 (patch) | |
tree | 9f9a631324126407916055efc58b878900993637 /drivers/nvme | |
parent | fcf38cdf332a81b20a59e3ebaea81f6b316bbe0c (diff) | |
download | linux-stable-b224f6134d72e3493a023b5bea917f9a6beea0c8.tar.gz linux-stable-b224f6134d72e3493a023b5bea917f9a6beea0c8.tar.bz2 linux-stable-b224f6134d72e3493a023b5bea917f9a6beea0c8.zip |
nvme: set discard_alignment to zero
Similar to 7c084289795b ("rbd: set discard_alignment to zero"), NVMe
devices are currently incorrectly initialised with the block queue
discard_alignment set to the NVMe stream alignment.
As per Documentation/ABI/testing/sysfs-block:
The discard_alignment parameter indicates how many bytes the beginning
of the device is offset from the internal allocation unit's natural
alignment.
Correcting the discard_alignment parameter to zero has no effect on how
discard requests are propagated through the block layer - @alignment in
__blkdev_issue_discard() remains zero. However, it does fix other
consumers, such as LIO's Block Limits VPD response.
Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
-rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index f837d666cbd4..67f2f94cf86e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1287,7 +1287,7 @@ static void nvme_config_discard(struct nvme_ctrl *ctrl, BUILD_BUG_ON(PAGE_SIZE / sizeof(struct nvme_dsm_range) < NVME_DSM_MAX_RANGES); - queue->limits.discard_alignment = size; + queue->limits.discard_alignment = 0; queue->limits.discard_granularity = size; blk_queue_max_discard_sectors(queue, UINT_MAX); |