diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-30 12:03:14 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-30 12:03:14 +0000 |
| commit | eacc5467041c23968e9447b7143975ee4eaaeeee (patch) | |
| tree | e654de48d06640d11ee4b9e815fcfecab7658bac /usr/src/lib/sun_sas/common/Sun_sasScsiInquiry.c | |
| parent | d84c48b412a8b9237a5f5ebbd017bc17997a127d (diff) | |
| parent | 106e8bd44b02f4b8cd3c825790276c1c7081e67a (diff) | |
| download | illumos-joyent-eacc5467041c23968e9447b7143975ee4eaaeeee.tar.gz | |
[illumos-gate merge]
commit 106e8bd44b02f4b8cd3c825790276c1c7081e67a
11867 PCIe expansion slots mis-labelled in topo
commit 00f453f4ebc211cb928f19a54d3f4edd61f43279
11862 cleanup smatch/cstyle/wscheck issues in usr/src/lib/sun_sas/
commit 744b124e8caed130fec6baedb0c53d1b6de03e41
11885 man3m: missing symlinks
commit 6b734416901818aa8c4bbb09c12b691ea771dc94
11858 crontab could support /step
commit ece0bc848de931052064be9faf07f4e44c150a15
11883 loader: zio_checksum_verify should check byteswap
commit 1a2641f606f3bfa50cdbbe8770af78116de52563
11521 ::whereopen should be usable in a pipeline
commit 042b56085944fdf280ee8e4a93b329c206054f88
11882 loader: rs_alloc() may return NULL
commit b12258b69ac245658b0ca5ae070b3ff004186148
11866 Use -fstack-protector-strong when available
commit 241bfedfbd27da9d3f2aa7ffaafa5da978f23afe
11842 Want audit events for auditon(A_SETPMASK) and friends
commit 8675de3a4bb7d310dd672e8f2bf479154e07c678
11872 Fix incremental recursive encrypted receive
commit 7ca0d613a17085b59a8b231daa9eddfa74fd83ee
11845 acquire-spray test could be improved
11857 kmc-update test missing from runfile
commit a0ee54468d6e6b136d1ca470a03bb44165c66e6e
11871 smatch should not hammer linux procfs path
Conflicts:
usr/src/uts/intel/Makefile.intel
usr/src/cmd/cron/cron.h
usr/src/cmd/cron/cron.c
usr/src/cmd/cron/Makefile
Diffstat (limited to 'usr/src/lib/sun_sas/common/Sun_sasScsiInquiry.c')
| -rw-r--r-- | usr/src/lib/sun_sas/common/Sun_sasScsiInquiry.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/src/lib/sun_sas/common/Sun_sasScsiInquiry.c b/usr/src/lib/sun_sas/common/Sun_sasScsiInquiry.c index 144a85d89d..f6dc9f367a 100644 --- a/usr/src/lib/sun_sas/common/Sun_sasScsiInquiry.c +++ b/usr/src/lib/sun_sas/common/Sun_sasScsiInquiry.c @@ -23,6 +23,9 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* + * Copyright 2019 Joyent, Inc. + */ #include <sun_sas.h> @@ -67,9 +70,9 @@ SendScsiInquiry(const char *devpath, HBA_UINT8 cdb1, HBA_UINT8 cdb2, */ HBA_STATUS Sun_sasScsiInquiry(HBA_HANDLE handle, HBA_WWN portWWN, HBA_WWN targetPortWWN, - HBA_WWN domainPortWWN, SMHBA_SCSILUN smhbaLUN, HBA_UINT8 cdb1, - HBA_UINT8 cdb2, void *responseBuffer, HBA_UINT32 *responseSize, - HBA_UINT8 *scsiStatus, void *senseBuffer, HBA_UINT32 *senseSize) + HBA_WWN domainPortWWN, SMHBA_SCSILUN smhbaLUN, HBA_UINT8 cdb1, + HBA_UINT8 cdb2, void *responseBuffer, HBA_UINT32 *responseSize, + HBA_UINT8 *scsiStatus, void *senseBuffer, HBA_UINT32 *senseSize) { const char ROUTINE[] = "Sun_sasScsiInquiry"; HBA_STATUS status; @@ -131,9 +134,9 @@ Sun_sasScsiInquiry(HBA_HANDLE handle, HBA_WWN portWWN, HBA_WWN targetPortWWN, * By verifying this information here, we will take a big performance * hit. This check will be done later only if the Inquiry ioctl fails */ - if (hba_ptr->device_path == NULL) { + if (hba_ptr->device_path[0] == '\0') { log(LOG_DEBUG, ROUTINE, - "HBA handle had NULL device path. \ + "HBA handle had empty device path. \ Unable to send SCSI cmd"); unlock(&open_handles_lock); unlock(&all_hbas_lock); |