diff options
| author | Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> | 2016-10-19 09:51:05 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-10-19 11:36:22 -0600 |
| commit | 8ef2074d28373014d05e92b5f13364ef51075b6e (patch) | |
| tree | 91ac7fced12f266dbf6e42aa73c0dffa1aeb039f /drivers/nvme/host/scsi.c | |
| parent | 202021c1a63c6ed69b3260e0fe10530c51f1e53e (diff) | |
| download | op-kernel-dev-8ef2074d28373014d05e92b5f13364ef51075b6e.zip op-kernel-dev-8ef2074d28373014d05e92b5f13364ef51075b6e.tar.gz | |
nvme: Add tertiary number to NVME_VS
NVMe 1.2.1 specification adds a tertiary element to the version number.
This updates the macro and its callers to include the final number and
fixup a single place in nvmet where the version was generated manually.
Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/scsi.c')
| -rw-r--r-- | drivers/nvme/host/scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/scsi.c b/drivers/nvme/host/scsi.c index c2a0a1c7..3eaa4d2 100644 --- a/drivers/nvme/host/scsi.c +++ b/drivers/nvme/host/scsi.c @@ -606,7 +606,7 @@ static int nvme_fill_device_id_eui64(struct nvme_ns *ns, struct sg_io_hdr *hdr, eui = id_ns->eui64; len = sizeof(id_ns->eui64); - if (ns->ctrl->vs >= NVME_VS(1, 2)) { + if (ns->ctrl->vs >= NVME_VS(1, 2, 0)) { if (bitmap_empty(eui, len * 8)) { eui = id_ns->nguid; len = sizeof(id_ns->nguid); @@ -679,7 +679,7 @@ static int nvme_trans_device_id_page(struct nvme_ns *ns, struct sg_io_hdr *hdr, { int res; - if (ns->ctrl->vs >= NVME_VS(1, 1)) { + if (ns->ctrl->vs >= NVME_VS(1, 1, 0)) { res = nvme_fill_device_id_eui64(ns, hdr, resp, alloc_len); if (res != -EOPNOTSUPP) return res; |
