summaryrefslogtreecommitdiff
path: root/usr/src/lib/libdiskmgt/common
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libdiskmgt/common')
-rw-r--r--usr/src/lib/libdiskmgt/common/findevs.c6
-rw-r--r--usr/src/lib/libdiskmgt/common/libdiskmgt.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/lib/libdiskmgt/common/findevs.c b/usr/src/lib/libdiskmgt/common/findevs.c
index d5de1af440..9e20eab703 100644
--- a/usr/src/lib/libdiskmgt/common/findevs.c
+++ b/usr/src/lib/libdiskmgt/common/findevs.c
@@ -27,6 +27,7 @@
/*
* Copyright (c) 2011 by Delphix. All rights reserved.
* Copyright 2017 Nexenta Systems, Inc.
+ * Copyright 2017 Joyent, Inc.
* Copyright 2021 Oxide Computer Company
*/
@@ -68,6 +69,7 @@
static char *ctrltypes[] = {
DDI_NT_FC_ATTACHMENT_POINT,
DDI_NT_NVME_ATTACHMENT_POINT,
+ DDI_NT_NVME_NEXUS,
DDI_NT_SATA_ATTACHMENT_POINT,
DDI_NT_SATA_NEXUS,
DDI_NT_SCSI_ATTACHMENT_POINT,
@@ -1063,8 +1065,10 @@ ctype(di_node_t node, di_minor_t minor)
libdiskmgt_str_eq(name, "fp")))
return (DM_CTYPE_FIBRE);
- if (libdiskmgt_str_eq(type, DDI_NT_NVME_ATTACHMENT_POINT))
+ if (libdiskmgt_str_eq(type, DDI_NT_NVME_NEXUS) ||
+ libdiskmgt_str_eq(type, DDI_NT_NVME_ATTACHMENT_POINT)) {
return (DM_CTYPE_NVME);
+ }
if (libdiskmgt_str_eq(type, DDI_NT_SATA_NEXUS) ||
libdiskmgt_str_eq(type, DDI_NT_SATA_ATTACHMENT_POINT))
diff --git a/usr/src/lib/libdiskmgt/common/libdiskmgt.h b/usr/src/lib/libdiskmgt/common/libdiskmgt.h
index 6c3a0d4325..4efc14ab44 100644
--- a/usr/src/lib/libdiskmgt/common/libdiskmgt.h
+++ b/usr/src/lib/libdiskmgt/common/libdiskmgt.h
@@ -25,8 +25,8 @@
*/
/*
- * Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright 2017 Nexenta Systems, Inc.
+ * Copyright (c) 2017, Joyent, Inc. All rights reserved.
*/
#ifndef _LIBDISKMGT_H