summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/sys
diff options
context:
space:
mode:
authorHans Rosenfeld <hans.rosenfeld@nexenta.com>2015-08-04 23:02:41 +0200
committerHans Rosenfeld <rosenfeld@grumpf.hope-2000.org>2015-09-16 10:40:55 +0200
commit39fd84a866206a99cbb6b6e63e0c38a367aaa88e (patch)
tree821942ea22e8468b31aaaacfaaa0720bd1da489c /usr/src/uts/common/sys
parent6734c4b0468cc77a7871a5dd5c23a5562557d64c (diff)
downloadillumos-joyent-39fd84a866206a99cbb6b6e63e0c38a367aaa88e.tar.gz
6119 mptsas doesn't handle timeouts in mptsas_get_sata_guid()
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com> Reviewed by: Gordon Ross <gordon.ross@nexenta.com> Reviewed by: Dan Fields <dan.fields@nexenta.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Albert Lee <trisk@omniti.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/uts/common/sys')
-rw-r--r--usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h5
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 836548aa30..3983188fce 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 (c) 2013, Joyent, Inc. All rights reserved.
* 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;