diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-10 12:33:15 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-10 12:33:15 +0000 |
| commit | 6bce34a549b9966860a142f5381a9fc1fe68c68c (patch) | |
| tree | 0c01ae67572f2c58f907cf08f6cb91b1529a80c1 /usr/src/uts | |
| parent | c2e53e4331d7069621f6df5fc7b73c4dbc20ec67 (diff) | |
| parent | ccbce734fa32e42c5bcbf1594753738697898823 (diff) | |
| download | illumos-joyent-6bce34a549b9966860a142f5381a9fc1fe68c68c.tar.gz | |
[illumos-gate merge]
commit ccbce734fa32e42c5bcbf1594753738697898823
12124 sort: cast between incompatible function types
commit a1cdd5a67f3bf3e60db3f3a77baef63640ad91a4
12176 util-tests: need ctf commands on path and C locale
commit 50d967713af8725306d090dd29033d9efe924715
12139 make: definition of implicit copy constructor is deprecated
commit d59679dc4ee5ea26c61e7762a3f7a6f74a1f4c2c
12163 mpt_sas: Collateral damage caused by dead SATA disk
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c index a786bbb051..e458c61168 100644 --- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c +++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c @@ -14898,10 +14898,12 @@ mptsas_update_hashtab(struct mptsas *mpt) rval = mptsas_get_target_device_info(mpt, page_address, &dev_handle, &ptgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { break; } + if (rval == DEV_INFO_FAIL_GUID) { + continue; + } mpt->m_dev_handle = dev_handle; } @@ -16601,12 +16603,12 @@ mptsas_phy_to_tgt(mptsas_t *mpt, mptsas_phymask_t phymask, uint8_t phy) rval = mptsas_get_target_device_info(mpt, page_address, &cur_handle, &ptgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { break; } if ((rval == DEV_INFO_WRONG_DEVICE_TYPE) || - (rval == DEV_INFO_PHYS_DISK)) { + (rval == DEV_INFO_PHYS_DISK) || + (rval == DEV_INFO_FAIL_GUID)) { continue; } mpt->m_dev_handle = cur_handle; @@ -16671,13 +16673,13 @@ mptsas_wwid_to_ptgt(mptsas_t *mpt, mptsas_phymask_t phymask, uint64_t wwid) rval = mptsas_get_target_device_info(mpt, page_address, &cur_handle, &tmp_tgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { tmp_tgt = NULL; break; } if ((rval == DEV_INFO_WRONG_DEVICE_TYPE) || - (rval == DEV_INFO_PHYS_DISK)) { + (rval == DEV_INFO_PHYS_DISK) || + (rval == DEV_INFO_FAIL_GUID)) { continue; } mpt->m_dev_handle = cur_handle; |