diff options
Diffstat (limited to 'usr/src/lib/libdiskmgt/common')
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/findevs.c | 6 | ||||
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/libdiskmgt.h | 2 |
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 8114f31352..2ac0e6cada 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. */ #include <fcntl.h> @@ -67,6 +68,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, @@ -1019,8 +1021,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 7391350962..96bf472842 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 |