diff options
| author | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-16 14:55:15 +0000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-16 14:55:15 +0000 |
| commit | 31a74c182cf2b5150a704786c53c053fd31b4c6d (patch) | |
| tree | 5eb53f7e1729ae4bf03e842ae3333e511b1a588d /usr/src/uts/common/sys | |
| parent | a845c808b8c12dd241b837bd48ae775b26d458fe (diff) | |
| parent | 39fd84a866206a99cbb6b6e63e0c38a367aaa88e (diff) | |
| download | illumos-joyent-31a74c182cf2b5150a704786c53c053fd31b4c6d.tar.gz | |
[illumos-gate merge]
commit 39fd84a866206a99cbb6b6e63e0c38a367aaa88e
6119 mptsas doesn't handle timeouts in mptsas_get_sata_guid()
commit 6d532798b6559eb98b586fd17725d8093f3b9ade
6168 strlcpy() does not return s1
commit 3c9168fa8e9c30d55b3aa2fde74bd7da46df53f5
4053 Add NVME Driver Support to Illumos
commit b08923d6c9c63a4f4b647b84d9454d8124fcedd7
6210 ping can misreport ICMP latency
6211 want warnings in the face of long running name lookups for ping
6212 Want sub-second ping interval support
6213 clean up warnings in ping
commit 0d045c0d0cb001d79480ee33be28514e847f8612
6209 libc mutexes break kernel writers hearts
Conflicts:
usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c
usr/src/lib/libc/port/threads/assfail.c
usr/src/uts/common/Makefile.files
usr/src/uts/common/Makefile.rules
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h b/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h index 2689fe27c4..02116b45c4 100644 --- a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h +++ b/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h @@ -21,7 +21,7 @@ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright 2015, Joyent, Inc. * Copyright (c) 2014, Tegile Systems Inc. All rights reserved. */ @@ -100,6 +100,7 @@ typedef uint16_t mptsas_phymask_t; */ #define MPTSAS_SMP_BUCKET_COUNT 23 #define MPTSAS_TARGET_BUCKET_COUNT 97 +#define MPTSAS_TMP_TARGET_BUCKET_COUNT 13 /* * MPT HW defines @@ -557,6 +558,7 @@ _NOTE(DATA_READABLE_WITHOUT_LOCK(mptsas_topo_change_list_t::flags)) #define DEV_INFO_WRONG_DEVICE_TYPE 0x2 #define DEV_INFO_PHYS_DISK 0x3 #define DEV_INFO_FAIL_ALLOC 0x4 +#define DEV_INFO_FAIL_GUID 0x5 /* * mpt hotplug event defines @@ -699,6 +701,7 @@ typedef struct mptsas { refhash_t *m_targets; refhash_t *m_smp_targets; + refhash_t *m_tmp_targets; m_raidconfig_t m_raidconfig[MPTSAS_MAX_RAIDCONFIGS]; uint8_t m_num_raid_configs; |