diff options
| author | Toomas Soome <tsoome@me.com> | 2017-07-15 13:15:24 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-02-16 11:18:18 -0500 |
| commit | 146ac3cd9d5017d58ec9ba26132a9ee30d53c4aa (patch) | |
| tree | f0229d521051f0d35f7bdb285aa260bfb8d7679a | |
| parent | 3d580eda65b7c5ad75a73a93dceeebddfae06ec9 (diff) | |
| download | illumos-joyent-146ac3cd9d5017d58ec9ba26132a9ee30d53c4aa.tar.gz | |
9090 ses: using integer constants in boolean context, the expression will always evaluate to 'true'
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/scsi/targets/ses.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/scsi/targets/ses.c b/usr/src/uts/common/io/scsi/targets/ses.c index dc6267e4c3..0572ad856e 100644 --- a/usr/src/uts/common/io/scsi/targets/ses.c +++ b/usr/src/uts/common/io/scsi/targets/ses.c @@ -1318,6 +1318,10 @@ CHECK_PKT: case QUE_COMMAND: SES_LOG(ssc, SES_CE_DEBUG1, "retrying cmd"); if (ssc->ses_retries > SES_NO_RETRY) { + clock_t ms_time; + + ms_time = + (err == EBUSY)? SES_BUSY_TIME : SES_RESTART_TIME; ssc->ses_retries -= (err == EBUSY)? SES_BUSY_RETRY: SES_CMD_RETRY; scmd->uscsi_status = 0; @@ -1325,8 +1329,7 @@ CHECK_PKT: bzero(pkt->pkt_scbp, sizeof (struct scsi_arq_status)); - SES_ENABLE_RESTART( - (err == EBUSY)? SES_BUSY_TIME: SES_RESTART_TIME, + SES_ENABLE_RESTART(ms_time, (struct scsi_pkt *)bp->av_back); return; } |