summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-04-25 12:17:55 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-04-25 12:17:55 +0000
commitafdd5fd8c7565bef583a831e14d8bce41a3bc741 (patch)
treef2d38ac4e14c8f0d5b24df80279533bcb6802f0e
parent59125e10a9de77326891a4062d145db60313894d (diff)
parentbf8c808aff646a7e2006c1a6fe7bcd596ce78105 (diff)
downloadillumos-joyent-afdd5fd8c7565bef583a831e14d8bce41a3bc741.tar.gz
[illumos-gate merge]
commit bf8c808aff646a7e2006c1a6fe7bcd596ce78105 9285 nvme: "programming error: invalid NS/format" doing 'nvmeadm list' on a controller without namespaces
-rw-r--r--usr/src/uts/common/io/nvme/nvme.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/uts/common/io/nvme/nvme.c b/usr/src/uts/common/io/nvme/nvme.c
index dded3186da..c6785b28d3 100644
--- a/usr/src/uts/common/io/nvme/nvme.c
+++ b/usr/src/uts/common/io/nvme/nvme.c
@@ -2554,6 +2554,13 @@ nvme_init(nvme_t *nvme)
* Identify Namespaces
*/
nvme->n_namespace_count = nvme->n_idctl->id_nn;
+
+ if (nvme->n_namespace_count == 0) {
+ dev_err(nvme->n_dip, CE_WARN,
+ "!controllers without namespaces are not supported");
+ goto fail;
+ }
+
if (nvme->n_namespace_count > NVME_MINOR_MAX) {
dev_err(nvme->n_dip, CE_WARN,
"!too many namespaces: %d, limiting to %d\n",