summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr/src/common/iscsi/base64.c6
-rw-r--r--usr/src/uts/common/io/idm/idm.c14
-rw-r--r--usr/src/uts/common/io/idm/idm_conn_sm.c50
-rw-r--r--usr/src/uts/common/io/idm/idm_impl.c7
-rw-r--r--usr/src/uts/common/io/idm/idm_so.c14
5 files changed, 50 insertions, 41 deletions
diff --git a/usr/src/common/iscsi/base64.c b/usr/src/common/iscsi/base64.c
index f4f336480e..3ee84e4055 100644
--- a/usr/src/common/iscsi/base64.c
+++ b/usr/src/common/iscsi/base64.c
@@ -72,7 +72,7 @@ outdec64(unsigned char *out, unsigned char *chr, int num)
switch (num) {
case 0:
- case 1: /* these are impossible */
+ case 1: /* these are impossible */
default:
break;
case 2: /* 2 base64 bytes == 1 decoded byte */
@@ -132,7 +132,7 @@ iscsi_base64_str_to_binary(char *hstr, int hstr_len,
*out_len = 0;
iptr = hstr;
- while (((curchr = *(iptr++)) != NULL) &&
+ while (((curchr = *(iptr++)) != '\0') &&
(((uintptr_t)iptr - (uintptr_t)hstr) <= hstr_len)) {
/* decode chars */
if (curchr == '=') /* if end */
@@ -186,7 +186,7 @@ int
iscsi_binary_to_base64_str(uint8_t *in_buf, int in_buf_len,
char *base64_str_buf, int base64_buf_len)
{
- uint8_t *iptr;
+ uint8_t *iptr;
char *optr;
int in_bytes_remaining;
diff --git a/usr/src/uts/common/io/idm/idm.c b/usr/src/uts/common/io/idm/idm.c
index 9951a74684..877a0e6f20 100644
--- a/usr/src/uts/common/io/idm/idm.c
+++ b/usr/src/uts/common/io/idm/idm.c
@@ -293,7 +293,7 @@ idm_ini_conn_connect(idm_conn_t *ic)
idm_conn_hold(ic);
/* Kick state machine */
- idm_conn_event(ic, CE_CONNECT_REQ, NULL);
+ idm_conn_event(ic, CE_CONNECT_REQ, (uintptr_t)NULL);
/* Wait for login flag */
mutex_enter(&ic->ic_state_mutex);
@@ -332,7 +332,7 @@ idm_ini_conn_connect(idm_conn_t *ic)
void
idm_ini_conn_disconnect(idm_conn_t *ic)
{
- idm_conn_event(ic, CE_TRANSPORT_FAIL, NULL);
+ idm_conn_event(ic, CE_TRANSPORT_FAIL, (uintptr_t)NULL);
}
/*
@@ -351,7 +351,8 @@ idm_ini_conn_disconnect_sync(idm_conn_t *ic)
mutex_enter(&ic->ic_state_mutex);
if ((ic->ic_state != CS_S9_INIT_ERROR) &&
(ic->ic_state != CS_S11_COMPLETE)) {
- idm_conn_event_locked(ic, CE_TRANSPORT_FAIL, NULL, CT_NONE);
+ idm_conn_event_locked(ic, CE_TRANSPORT_FAIL, (uintptr_t)NULL,
+ CT_NONE);
while ((ic->ic_state != CS_S9_INIT_ERROR) &&
(ic->ic_state != CS_S11_COMPLETE))
cv_wait(&ic->ic_state_cv, &ic->ic_state_mutex);
@@ -995,7 +996,7 @@ idm_buf_alloc(idm_conn_t *ic, void *bufptr, uint64_t buflen)
buf->idb_buflen = buflen;
buf->idb_exp_offset = 0;
buf->idb_bufoffset = 0;
- buf->idb_xfer_len = 0;
+ buf->idb_xfer_len = 0;
buf->idb_magic = IDM_BUF_MAGIC;
buf->idb_in_transport = B_FALSE;
buf->idb_bufbcopy = B_FALSE;
@@ -1280,7 +1281,7 @@ idm_task_alloc(idm_conn_t *ic)
idt->idt_state = TASK_IDLE;
idt->idt_ic = ic;
- idt->idt_private = NULL;
+ idt->idt_private = NULL;
idt->idt_exp_datasn = 0;
idt->idt_exp_rttsn = 0;
idt->idt_flags = 0;
@@ -2209,7 +2210,8 @@ idm_refcnt_rele_and_destroy(idm_refcnt_t *refcnt, idm_refcnt_cb_t *cb_func)
refcnt->ir_cb = cb_func;
refcnt->ir_waiting = REF_WAIT_ASYNC;
if (taskq_dispatch(idm.idm_global_taskq,
- &idm_refcnt_unref_task, refcnt, TQ_SLEEP) == TASKQID_INVALID) {
+ &idm_refcnt_unref_task, refcnt, TQ_SLEEP) ==
+ TASKQID_INVALID) {
cmn_err(CE_WARN,
"idm_refcnt_rele: Couldn't dispatch task");
}
diff --git a/usr/src/uts/common/io/idm/idm_conn_sm.c b/usr/src/uts/common/io/idm/idm_conn_sm.c
index bb750a2f31..52e515a983 100644
--- a/usr/src/uts/common/io/idm/idm_conn_sm.c
+++ b/usr/src/uts/common/io/idm/idm_conn_sm.c
@@ -494,7 +494,7 @@ idm_login_timeout(void *arg)
idm_conn_t *ic = arg;
ic->ic_state_timeout = 0;
- idm_conn_event(ic, CE_LOGIN_TIMEOUT, NULL);
+ idm_conn_event(ic, CE_LOGIN_TIMEOUT, (uintptr_t)NULL);
}
static void
@@ -512,7 +512,7 @@ idm_state_s3_xpt_up(idm_conn_t *ic, idm_conn_event_ctx_t *event_ctx)
* Don't need to cancel login timer since the timer is
* presumed to be the source of this event.
*/
- (void) idm_notify_client(ic, CN_LOGIN_FAIL, NULL);
+ (void) idm_notify_client(ic, CN_LOGIN_FAIL, (uintptr_t)NULL);
idm_update_state(ic, CS_S9_INIT_ERROR, event_ctx);
break;
case CE_CONNECT_REJECT:
@@ -530,7 +530,7 @@ idm_state_s3_xpt_up(idm_conn_t *ic, idm_conn_event_ctx_t *event_ctx)
case CE_LOGOUT_OTHER_CONN_SND:
/* T6 */
IDM_SM_TIMER_CLEAR(ic);
- (void) idm_notify_client(ic, CN_LOGIN_FAIL, NULL);
+ (void) idm_notify_client(ic, CN_LOGIN_FAIL, (uintptr_t)NULL);
idm_update_state(ic, CS_S9_INIT_ERROR, event_ctx);
break;
case CE_TX_PROTOCOL_ERROR:
@@ -569,7 +569,7 @@ idm_state_s4_in_login(idm_conn_t *ic, idm_conn_event_ctx_t *event_ctx)
break;
case CE_LOGIN_TIMEOUT:
/* T7 */
- (void) idm_notify_client(ic, CN_LOGIN_FAIL, NULL);
+ (void) idm_notify_client(ic, CN_LOGIN_FAIL, (uintptr_t)NULL);
idm_update_state(ic, CS_S9_INIT_ERROR, event_ctx);
break;
case CE_LOGIN_FAIL_SND:
@@ -603,7 +603,7 @@ idm_state_s4_in_login(idm_conn_t *ic, idm_conn_event_ctx_t *event_ctx)
case CE_LOGOUT_OTHER_CONN_RCV:
/* T7 */
IDM_SM_TIMER_CLEAR(ic);
- (void) idm_notify_client(ic, CN_LOGIN_FAIL, NULL);
+ (void) idm_notify_client(ic, CN_LOGIN_FAIL, (uintptr_t)NULL);
idm_update_state(ic, CS_S9_INIT_ERROR, event_ctx);
break;
case CE_LOGOUT_SESSION_SUCCESS:
@@ -831,7 +831,7 @@ idm_logout_req_timeout(void *arg)
idm_conn_t *ic = arg;
ic->ic_state_timeout = 0;
- idm_conn_event(ic, CE_LOGOUT_TIMEOUT, NULL);
+ idm_conn_event(ic, CE_LOGOUT_TIMEOUT, (uintptr_t)NULL);
}
static void
@@ -912,7 +912,7 @@ idm_cleanup_timeout(void *arg)
idm_conn_t *ic = arg;
ic->ic_state_timeout = 0;
- idm_conn_event(ic, CE_CLEANUP_TIMEOUT, NULL);
+ idm_conn_event(ic, CE_CLEANUP_TIMEOUT, (uintptr_t)NULL);
}
static void
@@ -1166,9 +1166,9 @@ idm_update_state(idm_conn_t *ic, idm_conn_state_t new_state,
break;
case CS_S2_XPT_WAIT:
if ((rc = idm_ini_conn_finish(ic)) != 0) {
- idm_conn_event(ic, CE_CONNECT_FAIL, NULL);
+ idm_conn_event(ic, CE_CONNECT_FAIL, (uintptr_t)NULL);
} else {
- idm_conn_event(ic, CE_CONNECT_SUCCESS, NULL);
+ idm_conn_event(ic, CE_CONNECT_SUCCESS, (uintptr_t)NULL);
}
break;
case CS_S3_XPT_UP:
@@ -1181,10 +1181,12 @@ idm_update_state(idm_conn_t *ic, idm_conn_state_t new_state,
if ((rc = idm_tgt_conn_finish(ic)) != IDM_STATUS_SUCCESS) {
switch (rc) {
case IDM_STATUS_REJECT:
- idm_conn_event(ic, CE_CONNECT_REJECT, NULL);
+ idm_conn_event(ic, CE_CONNECT_REJECT,
+ (uintptr_t)NULL);
break;
default:
- idm_conn_event(ic, CE_CONNECT_FAIL, NULL);
+ idm_conn_event(ic, CE_CONNECT_FAIL,
+ (uintptr_t)NULL);
break;
}
}
@@ -1195,11 +1197,12 @@ idm_update_state(idm_conn_t *ic, idm_conn_state_t new_state,
*/
IDM_SM_TIMER_CHECK(ic);
ic->ic_state_timeout = timeout(idm_login_timeout, ic,
- drv_usectohz(IDM_LOGIN_SECONDS*1000000));
+ drv_usectohz(IDM_LOGIN_SECONDS * 1000000));
break;
case CS_S4_IN_LOGIN:
if (ic->ic_conn_type == CONN_TYPE_INI) {
- (void) idm_notify_client(ic, CN_READY_FOR_LOGIN, NULL);
+ (void) idm_notify_client(ic, CN_READY_FOR_LOGIN,
+ (uintptr_t)NULL);
mutex_enter(&ic->ic_state_mutex);
ic->ic_state_flags |= CF_LOGIN_READY;
cv_signal(&ic->ic_state_cv);
@@ -1215,13 +1218,13 @@ idm_update_state(idm_conn_t *ic, idm_conn_state_t new_state,
*/
idm_status = idm_ffp_enable(ic);
if (idm_status != IDM_STATUS_SUCCESS) {
- idm_conn_event(ic, CE_TRANSPORT_FAIL, NULL);
+ idm_conn_event(ic, CE_TRANSPORT_FAIL, (uintptr_t)NULL);
}
if (ic->ic_reinstate_conn) {
/* Connection reinstatement is complete */
idm_conn_event(ic->ic_reinstate_conn,
- CE_CONN_REINSTATE_SUCCESS, NULL);
+ CE_CONN_REINSTATE_SUCCESS, (uintptr_t)NULL);
}
break;
case CS_S6_IN_LOGOUT:
@@ -1278,7 +1281,7 @@ idm_update_state(idm_conn_t *ic, idm_conn_state_t new_state,
ic);
} else {
(void) idm_notify_client(ic, CN_CONNECT_FAIL,
- NULL);
+ (uintptr_t)NULL);
}
}
/*FALLTHROUGH*/
@@ -1320,9 +1323,10 @@ idm_update_state(idm_conn_t *ic, idm_conn_state_t new_state,
ic->ic_transport_ops->it_tgt_enable_datamover(ic);
if (idm_status == IDM_STATUS_SUCCESS) {
- idm_conn_event(ic, CE_ENABLE_DM_SUCCESS, NULL);
+ idm_conn_event(ic, CE_ENABLE_DM_SUCCESS,
+ (uintptr_t)NULL);
} else {
- idm_conn_event(ic, CE_ENABLE_DM_FAIL, NULL);
+ idm_conn_event(ic, CE_ENABLE_DM_FAIL, (uintptr_t)NULL);
}
break;
@@ -1349,11 +1353,13 @@ idm_conn_unref(void *ic_void)
* IDM connection).
*/
if (IDM_CONN_ISTGT(ic)) {
- (void) idm_notify_client(ic, CN_CONNECT_DESTROY, NULL);
+ (void) idm_notify_client(ic, CN_CONNECT_DESTROY,
+ (uintptr_t)NULL);
idm_svc_conn_destroy(ic);
} else {
/* Initiator may destroy connection during this call */
- (void) idm_notify_client(ic, CN_CONNECT_DESTROY, NULL);
+ (void) idm_notify_client(ic, CN_CONNECT_DESTROY,
+ (uintptr_t)NULL);
}
}
@@ -1372,7 +1378,7 @@ idm_conn_reject_unref(void *ic_void)
static idm_pdu_event_action_t
idm_conn_sm_validate_pdu(idm_conn_t *ic, idm_conn_event_ctx_t *event_ctx,
- idm_pdu_t *pdu)
+ idm_pdu_t *pdu)
{
char *reason_string;
idm_pdu_event_action_t action;
@@ -1609,7 +1615,7 @@ idm_ffp_enable(idm_conn_t *ic)
ic->ic_ffp = B_TRUE;
mutex_exit(&ic->ic_state_mutex);
- rc = idm_notify_client(ic, CN_FFP_ENABLED, NULL);
+ rc = idm_notify_client(ic, CN_FFP_ENABLED, (uintptr_t)NULL);
if (rc != IDM_STATUS_SUCCESS) {
mutex_enter(&ic->ic_state_mutex);
ic->ic_ffp = B_FALSE;
diff --git a/usr/src/uts/common/io/idm/idm_impl.c b/usr/src/uts/common/io/idm/idm_impl.c
index 0ebf6edda7..76a2ad0525 100644
--- a/usr/src/uts/common/io/idm/idm_impl.c
+++ b/usr/src/uts/common/io/idm/idm_impl.c
@@ -297,7 +297,7 @@ idm_parse_login_rsp(idm_conn_t *ic, idm_pdu_t *login_rsp_pdu, boolean_t rx)
void
idm_parse_logout_req(idm_conn_t *ic, idm_pdu_t *logout_req_pdu, boolean_t rx)
{
- iscsi_logout_hdr_t *logout_req =
+ iscsi_logout_hdr_t *logout_req =
(iscsi_logout_hdr_t *)logout_req_pdu->isp_hdr;
idm_conn_event_t new_event;
uint8_t reason =
@@ -514,7 +514,7 @@ idm_tgt_conn_finish(idm_conn_t *ic)
{
idm_status_t rc;
- rc = idm_notify_client(ic, CN_CONNECT_ACCEPT, NULL);
+ rc = idm_notify_client(ic, CN_CONNECT_ACCEPT, (uintptr_t)NULL);
if (rc != IDM_STATUS_SUCCESS) {
return (IDM_STATUS_REJECT);
}
@@ -1170,7 +1170,8 @@ idm_wd_thread(void *arg)
"conn %p idle for %d seconds, "
"sending CE_TRANSPORT_FAIL",
(void *)ic, (int)idle_time);
- idm_conn_event(ic, CE_TRANSPORT_FAIL, NULL);
+ idm_conn_event(ic, CE_TRANSPORT_FAIL,
+ (uintptr_t)NULL);
mutex_enter(&idm.idm_global_mutex);
mutex_enter(&ic->ic_state_mutex);
}
diff --git a/usr/src/uts/common/io/idm/idm_so.c b/usr/src/uts/common/io/idm/idm_so.c
index e2d29e55ef..345483eeba 100644
--- a/usr/src/uts/common/io/idm/idm_so.c
+++ b/usr/src/uts/common/io/idm/idm_so.c
@@ -388,7 +388,7 @@ idm_v6_addr_okay(struct in6_addr *addr6)
int
idm_get_ipaddr(idm_addr_list_t **ipaddr_p)
{
- ksocket_t so4, so6;
+ ksocket_t so4, so6;
struct lifnum lifn;
struct lifconf lifc;
struct lifreq *lp;
@@ -622,7 +622,7 @@ idm_iov_sosend(ksocket_t so, iovec_t *iop, int iovlen, size_t total_len)
{
struct msghdr msg;
int error;
- size_t sent = 0;
+ size_t sent = 0;
ASSERT(iop != NULL);
@@ -663,7 +663,7 @@ idm_iov_sorecv(ksocket_t so, iovec_t *iop, int iovlen, size_t total_len)
struct msghdr msg;
int error;
size_t recv;
- int flags;
+ int flags;
ASSERT(iop != NULL);
@@ -981,7 +981,7 @@ idm_so_ini_conn_connect(idm_conn_t *ic)
{
idm_so_conn_t *so_conn;
struct sonode *node = NULL;
- int rc;
+ int rc;
clock_t lbolt, conn_login_max, conn_login_interval;
boolean_t nonblock;
@@ -1324,7 +1324,7 @@ idm_so_svc_port_watcher(void *arg)
idm_so_svc_t *so_svc;
int rc;
const uint32_t off = 0;
- struct sockaddr_in6 t_addr;
+ struct sockaddr_in6 t_addr;
socklen_t t_addrlen;
bzero(&t_addr, sizeof (struct sockaddr_in6));
@@ -1386,7 +1386,7 @@ idm_so_svc_port_watcher(void *arg)
* Kick the state machine. At CS_S3_XPT_UP the state machine
* will notify the client (target) about the new connection.
*/
- idm_conn_event(ic, CE_CONNECT_ACCEPT, NULL);
+ idm_conn_event(ic, CE_CONNECT_ACCEPT, (uintptr_t)NULL);
mutex_enter(&svc->is_mutex);
}
@@ -2618,7 +2618,7 @@ idm_so_send_rtt_data(idm_conn_t *ic, idm_task_t *idt, idm_buf_t *idb,
mutex_enter(&ic->ic_state_mutex);
if (ic->ic_ffp)
idm_conn_event_locked(ic, CE_TRANSPORT_FAIL,
- NULL, CT_NONE);
+ (uintptr_t)NULL, CT_NONE);
mutex_exit(&ic->ic_state_mutex);
mutex_exit(&idt->idt_mutex);
return;
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-21 19:00:48 +0000