summaryrefslogtreecommitdiffstats
path: root/drivers/block/nvme-scsi.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-05-17 07:58:08 +0200
committerIngo Molnar <mingo@kernel.org>2015-05-17 07:58:08 +0200
commitcffc32975da7df2ef909299c47ff644e1357e0ac (patch)
tree04cfa6276b890f49f686d65be7397c4232ac44af /drivers/block/nvme-scsi.c
parent6dc178760553605c58d78bd403dfcb4e042c5b72 (diff)
parentadeb5537849d9db428fe0ddc3562e5a765a347e2 (diff)
downloadop-kernel-dev-cffc32975da7df2ef909299c47ff644e1357e0ac.zip
op-kernel-dev-cffc32975da7df2ef909299c47ff644e1357e0ac.tar.gz
Merge branch 'x86/asm' into x86/apic, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/block/nvme-scsi.c')
-rw-r--r--drivers/block/nvme-scsi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
index 6b736b0..88f13c5 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/block/nvme-scsi.c
@@ -944,7 +944,8 @@ static int nvme_trans_ext_inq_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
static int nvme_trans_bdev_limits_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
u8 *inq_response, int alloc_len)
{
- __be32 max_sectors = cpu_to_be32(queue_max_hw_sectors(ns->queue));
+ __be32 max_sectors = cpu_to_be32(
+ nvme_block_nr(ns, queue_max_hw_sectors(ns->queue)));
__be32 max_discard = cpu_to_be32(ns->queue->limits.max_discard_sectors);
__be32 discard_desc_count = cpu_to_be32(0x100);
OpenPOWER on IntegriCloud