diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.h | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_conn.c | 8 | ||||
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_login.c | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.h b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.h index 28c4c799b7..62b6487866 100644 --- a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.h +++ b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.h @@ -385,7 +385,7 @@ typedef enum iscsi_cmd_text_stage { #define ISCSI_CMD_MISCFLAG_INTERNAL 0x1 #define ISCSI_CMD_MISCFLAG_FREE 0x2 #define ISCSI_CMD_MISCFLAG_STUCK 0x4 -#define ISCSI_CMD_MISCFLAG_XARQ 0x8 +#define ISCSI_CMD_MISCFLAG_XARQ 0x8 #define ISCSI_CMD_MISCFLAG_SENT 0x10 #define ISCSI_CMD_MISCFLAG_FLUSH 0x20 @@ -1174,7 +1174,7 @@ typedef struct iscsi_hba { * - need to be exclusive * * The service has three status: - * ISCSI_SERVICE_ENABLED - client is permitted to + * ISCSI_SERVICE_ENABLED - client is permitted to * - request service * * ISCSI_SERVICE_DISABLED - client is not permitted to @@ -1266,6 +1266,7 @@ void iscsi_enqueue_cmd_head(iscsi_cmd_t **, iscsi_cmd_t **, iscsi_cmd_t *); /* iscsi_login.c */ +void iscsi_login_cb(void *arg); iscsi_status_t iscsi_login_start(void *arg); void iscsi_login_update_state(iscsi_conn_t *icp, iscsi_login_state_t next_state); diff --git a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_conn.c b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_conn.c index f4d2e265cf..f627cab530 100644 --- a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_conn.c +++ b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_conn.c @@ -1049,7 +1049,7 @@ iscsi_conn_retry(iscsi_sess_t *isp, iscsi_conn_t *icp) itp->t_arg = icp; itp->t_blocking = B_FALSE; if (ddi_taskq_dispatch(isp->sess_login_taskq, - (void(*)())iscsi_login_start, itp, DDI_SLEEP) != + iscsi_login_cb, itp, DDI_SLEEP) != DDI_SUCCESS) { kmem_free(itp, sizeof (iscsi_task_t)); cmn_err(CE_WARN, "iscsi connection(%u) failure - " @@ -1068,8 +1068,7 @@ iscsi_conn_retry(iscsi_sess_t *isp, iscsi_conn_t *icp) } void -iscsi_conn_update_state(iscsi_conn_t *icp, iscsi_conn_state_t - next_state) +iscsi_conn_update_state(iscsi_conn_t *icp, iscsi_conn_state_t next_state) { mutex_enter(&icp->conn_state_mutex); (void) iscsi_conn_update_state_locked(icp, next_state); @@ -1077,8 +1076,7 @@ iscsi_conn_update_state(iscsi_conn_t *icp, iscsi_conn_state_t } void -iscsi_conn_update_state_locked(iscsi_conn_t *icp, - iscsi_conn_state_t next_state) +iscsi_conn_update_state_locked(iscsi_conn_t *icp, iscsi_conn_state_t next_state) { ASSERT(mutex_owned(&icp->conn_state_mutex)); next_state = (next_state > ISCSI_CONN_STATE_MAX) ? diff --git a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_login.c b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_login.c index 42ddf9a9d4..1a23e6f029 100644 --- a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_login.c +++ b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi_login.c @@ -70,6 +70,12 @@ static void iscsi_notice_key_values(iscsi_conn_t *icp); * +--------------------------------------------------------------------+ */ +void +iscsi_login_cb(void *arg) +{ + (void) iscsi_login_start(arg); +} + /* * iscsi_login_start - connect and perform iscsi protocol login */ @@ -235,7 +241,7 @@ login_retry: goto login_start; } else { if (ddi_taskq_dispatch(isp->sess_login_taskq, - (void(*)())iscsi_login_start, itp, DDI_SLEEP) != + iscsi_login_cb, itp, DDI_SLEEP) != DDI_SUCCESS) { iscsi_login_end(icp, ISCSI_STATUS_LOGIN_TIMED_OUT, itp); |