diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-09-30 11:54:19 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-09-30 11:54:19 +0000 |
| commit | c9f119ea87d496552bff16679235b3bb4b7c46cf (patch) | |
| tree | b21a30801fd6186321a3ccc132a0cba435e5d8d0 /usr/src/cmd/devfsadm | |
| parent | dcdce866277bb3ad59e2c63c5019591446df9f27 (diff) | |
| parent | 9f9230833b50b8271840dc2c12bd1e94d9df7d12 (diff) | |
| download | illumos-joyent-c9f119ea87d496552bff16679235b3bb4b7c46cf.tar.gz | |
[illumos-gate merge]
commit 9f9230833b50b8271840dc2c12bd1e94d9df7d12
5969 update illumos-gate to use python2.7
commit 8ae05c101a3c849364fa53a66ec87aa59823326a
7392 remove event channel support from lofi and implement lofi_devlink_cache.
commit 5cbe397111597bc67a2d5d429b52a503f55a14b3
7437 Add the missing space between .asciz directive and opening quote in btxldr.S
commit 24979ca36afa68d08e082148fcbf4c5dc73f7849
7382 basic NVMe 1.1 support
commit df8c228748280860358d01a3d32ce256aeb51c38
7381 support EUI64 in blkdev
commit ad6d02f81083a7397e072fc604c6c339bc472dc3
7383 sunddi.h isn't cstyle clean
commit 6801591e1fea06222c50622c468541c82c67cdb4
7377 want mechanism to override physical block size of NVMe devices
commit a2bd3819aa1376ad4827c467317475bab181157d
7376 nvme(7d) manpage cleanup
commit d148d46e69709052e6d92205c98874f3e7cfd4c0
7372 support NVMe volatile write cache
Conflicts:
usr/src/tools/scripts/wsdiff.py
usr/src/tools/scripts/validate_pkg.py
usr/src/tools/scripts/mapfilechk.py
usr/src/tools/scripts/hg-active.py
usr/src/tools/scripts/hdrchk.py
usr/src/tools/scripts/git-pbchk.py
usr/src/tools/scripts/copyrightchk.py
usr/src/tools/scripts/cddlchk.py
usr/src/test/test-runner/cmd/run
usr/src/test/test-runner/cmd/Makefile
usr/src/Makefile.master
Diffstat (limited to 'usr/src/cmd/devfsadm')
| -rw-r--r-- | usr/src/cmd/devfsadm/disk_link.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/usr/src/cmd/devfsadm/disk_link.c b/usr/src/cmd/devfsadm/disk_link.c index 0baa608912..3e966ac6bd 100644 --- a/usr/src/cmd/devfsadm/disk_link.c +++ b/usr/src/cmd/devfsadm/disk_link.c @@ -20,7 +20,7 @@ */ /* * Copyright 2016 Toomas Soome <tsoome@me.com> - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. + * Copyright 2016 Nexenta Systems, Inc. All rights reserved. * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -64,6 +64,7 @@ extern int system_labeled; static int disk_callback_chan(di_minor_t minor, di_node_t node); static int disk_callback_nchan(di_minor_t minor, di_node_t node); +static int disk_callback_blkdev(di_minor_t minor, di_node_t node); static int disk_callback_wwn(di_minor_t minor, di_node_t node); static int disk_callback_xvmd(di_minor_t minor, di_node_t node); static int disk_callback_fabric(di_minor_t minor, di_node_t node); @@ -82,6 +83,9 @@ static devfsadm_create_t disk_cbt[] = { { "disk", DDI_NT_BLOCK_CHAN, NULL, TYPE_EXACT, ILEVEL_0, disk_callback_chan }, + { "disk", DDI_NT_BLOCK_BLKDEV, NULL, + TYPE_EXACT, ILEVEL_0, disk_callback_blkdev + }, { "disk", DDI_NT_BLOCK_FABRIC, NULL, TYPE_EXACT, ILEVEL_0, disk_callback_fabric }, @@ -217,6 +221,21 @@ disk_callback_nchan(di_minor_t minor, di_node_t node) } static int +disk_callback_blkdev(di_minor_t minor, di_node_t node) +{ + char *addr; + char disk[DISK_SUBPATH_MAX]; + uint64_t eui64; + uint_t lun = 0; + + addr = di_bus_addr(node); + (void) sscanf(addr, "w%016"PRIx64",%X", &eui64, &lun); + (void) snprintf(disk, DISK_SUBPATH_MAX, "t%016"PRIX64"d%d", eui64, lun); + disk_common(minor, node, disk, RM_STALE); + return (DEVFSADM_CONTINUE); +} + +static int disk_callback_wwn(di_minor_t minor, di_node_t node) { char disk[10]; |