diff options
| author | Keith Busch <keith.busch@intel.com> | 2019-01-08 19:37:43 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-01-09 21:47:06 +0300 |
| commit | 3da584f57133e51aeb84aaefae5e3d69531a1e4f (patch) | |
| tree | 49d06317a61c51315b92cf10016cd7fdabd870c8 /drivers | |
| parent | c7055fd15ff46d92eb0dd1c16a4fe010d58224c8 (diff) | |
| download | linux-3da584f57133e51aeb84aaefae5e3d69531a1e4f.tar.xz | |
nvme: pad fake subsys NQN vid and ssvid with zeros
We need to preserve the leading zeros in the vid and ssvid when generating
a unique NQN. Truncating these may lead to naming collisions.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers')
| -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 08f2c92602f4..f81fde164d37 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2184,7 +2184,7 @@ static void nvme_init_subnqn(struct nvme_subsystem *subsys, struct nvme_ctrl *ct /* Generate a "fake" NQN per Figure 254 in NVMe 1.3 + ECN 001 */ off = snprintf(subsys->subnqn, NVMF_NQN_SIZE, - "nqn.2014.08.org.nvmexpress:%4x%4x", + "nqn.2014.08.org.nvmexpress:%04x%04x", le16_to_cpu(id->vid), le16_to_cpu(id->ssvid)); memcpy(subsys->subnqn + off, id->sn, sizeof(id->sn)); off += sizeof(id->sn); |