diff options
Diffstat (limited to 'usr/src/uts/common/io')
27 files changed, 110 insertions, 87 deletions
diff --git a/usr/src/uts/common/io/comstar/port/iscsit/iscsit_login.c b/usr/src/uts/common/io/comstar/port/iscsit/iscsit_login.c index dc7549c9b3..32b1ae3b09 100644 --- a/usr/src/uts/common/io/comstar/port/iscsit/iscsit_login.c +++ b/usr/src/uts/common/io/comstar/port/iscsit/iscsit_login.c @@ -382,7 +382,8 @@ iscsit_login_sm_event_locked(iscsit_conn_t *ict, iscsit_login_event_t event, if (lsm->icl_login_complete) { lsm->icl_busy = B_TRUE; if (taskq_dispatch(iscsit_global.global_dispatch_taskq, - login_sm_complete, ict, DDI_SLEEP) == NULL) { + login_sm_complete, ict, DDI_SLEEP) == + TASKQID_INVALID) { cmn_err(CE_WARN, "iscsit_login_sm_event_locked:" " Failed to dispatch task"); } diff --git a/usr/src/uts/common/io/comstar/port/iscsit/iscsit_tgt.c b/usr/src/uts/common/io/comstar/port/iscsit/iscsit_tgt.c index 63e9424484..97a1909ca0 100644 --- a/usr/src/uts/common/io/comstar/port/iscsit/iscsit_tgt.c +++ b/usr/src/uts/common/io/comstar/port/iscsit/iscsit_tgt.c @@ -650,7 +650,7 @@ iscsit_tgt_dereg_retry(void *arg) * If it fails we'll setup another timeout and try again later. */ if (taskq_dispatch(iscsit_global.global_dispatch_taskq, - iscsit_tgt_dereg_task, tgt, DDI_NOSLEEP) == NULL) { + iscsit_tgt_dereg_task, tgt, DDI_NOSLEEP) == TASKQID_INVALID) { /* Dispatch failed, try again later */ (void) timeout(iscsit_tgt_dereg_retry, tgt, drv_usectohz(TGT_DEREG_RETRY_SECONDS * 1000000)); diff --git a/usr/src/uts/common/io/comstar/port/pppt/pppt_tgt.c b/usr/src/uts/common/io/comstar/port/pppt/pppt_tgt.c index fbf8ad876f..6a6b2ed545 100644 --- a/usr/src/uts/common/io/comstar/port/pppt/pppt_tgt.c +++ b/usr/src/uts/common/io/comstar/port/pppt/pppt_tgt.c @@ -802,7 +802,7 @@ pppt_tgt_dereg_retry(void *arg) * If it fails we'll setup another timeout and try again later. */ if (taskq_dispatch(pppt_global.global_dispatch_taskq, - pppt_tgt_dereg_task, tgt, KM_NOSLEEP) == NULL) { + pppt_tgt_dereg_task, tgt, KM_NOSLEEP) == TASKQID_INVALID) { /* Dispatch failed, try again later */ (void) timeout(pppt_tgt_dereg_retry, tgt, drv_usectohz(TGT_DEREG_RETRY_SECONDS * 1000000)); diff --git a/usr/src/uts/common/io/dld/dld_str.c b/usr/src/uts/common/io/dld/dld_str.c index 3029288b19..5efbe0576d 100644 --- a/usr/src/uts/common/io/dld/dld_str.c +++ b/usr/src/uts/common/io/dld/dld_str.c @@ -1997,7 +1997,7 @@ dld_taskq_dispatch(void) list_remove(&dld_taskq_list, dsp); mutex_exit(&dld_taskq_lock); VERIFY(taskq_dispatch(dld_taskq, dld_wput_nondata_task, - dsp, TQ_SLEEP) != 0); + dsp, TQ_SLEEP) != TASKQID_INVALID); mutex_enter(&dld_taskq_lock); dsp = list_head(&dld_taskq_list); } @@ -2064,7 +2064,7 @@ dld_wput_nondata(dld_str_t *dsp, mblk_t *mp) mutex_exit(&dsp->ds_lock); if (taskq_dispatch(dld_taskq, dld_wput_nondata_task, dsp, - TQ_NOSLEEP) != 0) + TQ_NOSLEEP) != TASKQID_INVALID) return; mutex_enter(&dld_taskq_lock); diff --git a/usr/src/uts/common/io/emul64.c b/usr/src/uts/common/io/emul64.c index e8d18d109f..47383c619b 100644 --- a/usr/src/uts/common/io/emul64.c +++ b/usr/src/uts/common/io/emul64.c @@ -1029,7 +1029,7 @@ emul64_scsi_start(struct scsi_address *ap, struct scsi_pkt *pkt) if ((emul64_usetaskq == 0) || (pkt->pkt_flags & FLAG_NOINTR) != 0) { emul64_pkt_comp((caddr_t)pkt); } else { - dispatched = NULL; + dispatched = TASKQID_INVALID; if (emul64_collect_stats) { /* * If we are collecting statistics, call @@ -1042,14 +1042,14 @@ emul64_scsi_start(struct scsi_address *ap, struct scsi_pkt *pkt) */ dispatched = taskq_dispatch(emul64->emul64_taskq, emul64_pkt_comp, (void *)pkt, TQ_NOSLEEP); - if (dispatched == NULL) { + if (dispatched == TASKQID_INVALID) { /* Queue was full. dispatch failed. */ mutex_enter(&emul64_stats_mutex); emul64_taskq_max++; mutex_exit(&emul64_stats_mutex); } } - if (dispatched == NULL) { + if (dispatched == TASKQID_INVALID) { (void) taskq_dispatch(emul64->emul64_taskq, emul64_pkt_comp, (void *)pkt, TQ_SLEEP); } diff --git a/usr/src/uts/common/io/fibre-channel/impl/fp.c b/usr/src/uts/common/io/fibre-channel/impl/fp.c index ca35678c72..f4ad1f6d25 100644 --- a/usr/src/uts/common/io/fibre-channel/impl/fp.c +++ b/usr/src/uts/common/io/fibre-channel/impl/fp.c @@ -4839,7 +4839,7 @@ fp_ulp_devc_cb(fc_local_port_t *port, fc_portmap_t *changelist, } ret = taskq_dispatch(port->fp_taskq, fctl_ulp_statec_cb, clist, sleep); - if (sync && ret) { + if (sync && ret != TASKQID_INVALID) { mutex_enter(&clist->clist_mutex); while (clist->clist_wait) { cv_wait(&clist->clist_cv, &clist->clist_mutex); diff --git a/usr/src/uts/common/io/fibre-channel/ulp/fcip.c b/usr/src/uts/common/io/fibre-channel/ulp/fcip.c index 5989490929..416bc3cb55 100644 --- a/usr/src/uts/common/io/fibre-channel/ulp/fcip.c +++ b/usr/src/uts/common/io/fibre-channel/ulp/fcip.c @@ -4583,7 +4583,7 @@ fcip_handle_topology(struct fcip *fptr) if (!(fptr->fcip_flags & FCIP_REG_INPROGRESS)) { fptr->fcip_flags |= FCIP_REG_INPROGRESS; if (taskq_dispatch(fptr->fcip_tq, fcip_port_ns, - fptr, KM_NOSLEEP) == 0) { + fptr, KM_NOSLEEP) == TASKQID_INVALID) { fptr->fcip_flags &= ~FCIP_REG_INPROGRESS; } } @@ -7258,7 +7258,7 @@ fcip_timeout(void *arg) if (taskq_dispatch(fptr->fcip_tq, fcip_rte_remove_deferred, fptr, - KM_NOSLEEP) == 0) { + KM_NOSLEEP) == TASKQID_INVALID) { /* * failed - so mark the entry * as invalid again. @@ -7302,7 +7302,7 @@ fcip_timeout(void *arg) mutex_exit(&fdestp->fcipd_mutex); if (taskq_dispatch(fptr->fcip_tq, fcip_pkt_timeout, fcip_pkt, - KM_NOSLEEP) == 0) { + KM_NOSLEEP) == TASKQID_INVALID) { /* * timeout immediately */ diff --git a/usr/src/uts/common/io/fibre-channel/ulp/fcp.c b/usr/src/uts/common/io/fibre-channel/ulp/fcp.c index 963d3f523b..2bbd8a5a3f 100644 --- a/usr/src/uts/common/io/fibre-channel/ulp/fcp.c +++ b/usr/src/uts/common/io/fibre-channel/ulp/fcp.c @@ -14458,7 +14458,7 @@ fcp_pass_to_hp(struct fcp_port *pptr, struct fcp_lun *plun, } mutex_exit(&plun->lun_mutex); if (taskq_dispatch(DEVI(pdip)->devi_taskq, fcp_hp_task, - (void *)elem, KM_NOSLEEP) == NULL) { + (void *)elem, KM_NOSLEEP) == TASKQID_INVALID) { mutex_enter(&plun->lun_mutex); if (elem->what == FCP_ONLINE || elem->what == FCP_OFFLINE) { plun->lun_event_count--; diff --git a/usr/src/uts/common/io/ib/clients/daplt/daplt.c b/usr/src/uts/common/io/ib/clients/daplt/daplt.c index a207150d62..7c1849e605 100644 --- a/usr/src/uts/common/io/ib/clients/daplt/daplt.c +++ b/usr/src/uts/common/io/ib/clients/daplt/daplt.c @@ -1893,7 +1893,7 @@ daplka_timer_dispatch(void *arg) * taskq_dispatch succeeds. */ if (taskq_dispatch(daplka_taskq, - daplka_timer_thread, arg, TQ_NOSLEEP) == 0) { + daplka_timer_thread, arg, TQ_NOSLEEP) == TASKQID_INVALID) { DERR("timer_dispatch: taskq_dispatch failed, retrying...\n"); (void) timeout(daplka_timer_dispatch, arg, 10); } diff --git a/usr/src/uts/common/io/ib/clients/of/sol_ofs/sol_cma.c b/usr/src/uts/common/io/ib/clients/of/sol_ofs/sol_cma.c index 5384be7bd9..127044b3b3 100644 --- a/usr/src/uts/common/io/ib/clients/of/sol_ofs/sol_cma.c +++ b/usr/src/uts/common/io/ib/clients/of/sol_ofs/sol_cma.c @@ -1686,7 +1686,7 @@ cma_generate_event(struct rdma_cm_id *idp, enum rdma_cm_event_type event, } if (taskq_dispatch(system_taskq, cma_generate_event_thr, - (void *)event_arg, TQ_SLEEP) == 0) { + (void *)event_arg, TQ_SLEEP) == TASKQID_INVALID) { SOL_OFS_DPRINTF_L2(sol_rdmacm_dbg_str, "generate_event_async: taskq_dispatch() failed!!"); mutex_enter(&chanp->chan_mutex); diff --git a/usr/src/uts/common/io/ib/ibnex/ibnex.c b/usr/src/uts/common/io/ib/ibnex/ibnex.c index d25c6ddf05..765f215458 100644 --- a/usr/src/uts/common/io/ib/ibnex/ibnex.c +++ b/usr/src/uts/common/io/ib/ibnex/ibnex.c @@ -867,7 +867,7 @@ ibnex_ibtl_callback(ibtl_ibnex_cb_args_t *cb_args) * from interrupt context. */ if (taskq_dispatch(system_taskq, ibnex_handle_reprobe_dev, - clnt_dip, TQ_SLEEP) == 0) { + clnt_dip, TQ_SLEEP) == TASKQID_INVALID) { IBTF_DPRINTF_L2("ibnex", "ibnex_ibtl_callback: taskq_dispatch failed"); mutex_enter(&ibnex.ibnex_mutex); diff --git a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c index 7d1e625863..171a70e7ee 100644 --- a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c +++ b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_path.c @@ -482,7 +482,7 @@ ibcm_handle_get_path(ibt_path_attr_t *attrp, ibt_path_flags_t flags, if (func != NULL) { /* Non-Blocking */ IBTF_DPRINTF_L3(cmlog, "ibcm_handle_get_path: Non Blocking"); if (taskq_dispatch(ibcm_taskq, ibcm_process_async_get_paths, - path_tq, TQ_NOSLEEP) == 0) { + path_tq, TQ_NOSLEEP) == TASKQID_INVALID) { IBTF_DPRINTF_L2(cmlog, "ibcm_handle_get_path: " "Failed to dispatch the TaskQ"); kmem_free(path_tq, len); @@ -4169,7 +4169,7 @@ ibcm_get_ip_path(ibt_clnt_hdl_t ibt_hdl, ibt_path_flags_t flags, sleep_flag = ((func == NULL) ? TQ_SLEEP : TQ_NOSLEEP); ret = taskq_dispatch(ibcm_taskq, ibcm_process_get_ip_paths, path_tq, sleep_flag); - if (ret == 0) { + if (ret == TASKQID_INVALID) { IBTF_DPRINTF_L2(cmlog, "ibcm_get_ip_path: Failed to dispatch " "the TaskQ"); if (func == NULL) { /* Blocking */ diff --git a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_sm.c b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_sm.c index 24f09e7f0e..1afa236a1e 100644 --- a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_sm.c +++ b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_sm.c @@ -812,7 +812,7 @@ ibcm_recv_timeout_cb(void *args) ibcm_recv_tasks++; mutex_exit(&ibcm_recv_mutex); if (taskq_dispatch(ibcm_taskq, ibcm_recv_task, tq, - TQ_NOQUEUE | TQ_NOSLEEP) == 0) { + TQ_NOQUEUE | TQ_NOSLEEP) == TASKQID_INVALID) { mutex_enter(&ibcm_recv_mutex); if (--ibcm_recv_tasks == 0) { (void) timeout(ibcm_recv_timeout_cb, tq, 1); @@ -873,7 +873,8 @@ ibcm_recv_add_one(ibmf_handle_t ibmf_handle, ibmf_msg_t *msgp, void *args) tq->tq_args = args; _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*tq)) if (taskq_dispatch(ibcm_taskq, ibcm_recv_task, tq, - TQ_NOQUEUE | TQ_NOSLEEP) == 0) { /* dispatch failed */ + TQ_NOQUEUE | TQ_NOSLEEP) == TASKQID_INVALID) { + /* dispatch failed */ mutex_enter(&ibcm_recv_mutex); if (--ibcm_recv_tasks == 0) { /* try the dispatch again, after a tick */ @@ -3490,7 +3491,8 @@ ibcm_timeout_cb(void *arg) /* if possible, do not slow down calling recycle func */ if (taskq_dispatch(ibcm_taskq, ibcm_process_rc_recycle, - recycle_arg, TQ_NOQUEUE | TQ_NOSLEEP) == 0) { + recycle_arg, TQ_NOQUEUE | TQ_NOSLEEP) == + TASKQID_INVALID) { _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS( statep->recycle_arg)) diff --git a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_ti.c b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_ti.c index feb60d22e7..c14900a314 100644 --- a/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_ti.c +++ b/usr/src/uts/common/io/ib/mgt/ibcm/ibcm_ti.c @@ -1392,7 +1392,7 @@ ibcm_close_rc_channel(ibt_channel_hdl_t channel, ibcm_state_data_t *statep, if (mode == IBT_NONBLOCKING) { if (taskq_dispatch(ibcm_taskq, ibcm_process_abort_via_taskq, statep, - TQ_NOSLEEP) == 0) { + TQ_NOSLEEP) == TASKQID_INVALID) { IBCM_REF_CNT_DECR(statep); statep->state = old_state; @@ -4896,7 +4896,7 @@ ibt_join_mcg(ib_gid_t rgid, ibt_mcg_attr_t *mcg_attr, if (func != NULL) { /* Non-Blocking */ IBTF_DPRINTF_L3(cmlog, "ibt_join_mcg: Non-Blocking Call"); if (taskq_dispatch(ibcm_taskq, ibcm_process_async_join_mcg, - mcg_tq, TQ_NOSLEEP) == 0) { + mcg_tq, TQ_NOSLEEP) == TASKQID_INVALID) { IBTF_DPRINTF_L2(cmlog, "ibt_join_mcg: Failed to " "Dispatch the TaskQ"); kmem_free(mcg_tq, sizeof (ibcm_join_mcg_tqarg_t)); diff --git a/usr/src/uts/common/io/ib/mgt/ibdm/ibdm.c b/usr/src/uts/common/io/ib/mgt/ibdm/ibdm.c index c28ce4c429..960f2926bb 100644 --- a/usr/src/uts/common/io/ib/mgt/ibdm/ibdm.c +++ b/usr/src/uts/common/io/ib/mgt/ibdm/ibdm.c @@ -1487,7 +1487,7 @@ ibdm_sweep_fabric(int reprobe_flag) IBTF_DPRINTF_L4("ibdm", "\tsweep_fabric: gid_info = %p" " taskq_id = %x", gid_info, tid); /* taskq failed to dispatch call it directly */ - if (tid == NULL) + if (tid == TASKQID_INVALID) ibdm_probe_gid_thread((void *)gid_info); } @@ -3432,7 +3432,7 @@ ibdm_ibmf_recv_cb(ibmf_handle_t ibmf_hdl, ibmf_msg_t *msg, void *arg) taskq_args->tq_args = arg; if (taskq_dispatch(system_taskq, ibdm_recv_incoming_mad, taskq_args, - TQ_NOSLEEP) == 0) { + TQ_NOSLEEP) == TASKQID_INVALID) { IBTF_DPRINTF_L2("ibdm", "ibmf_recv_cb: taskq_dispatch failed"); if (ibmf_free_msg(ibmf_hdl, &msg) != IBMF_SUCCESS) { IBTF_DPRINTF_L4("ibmf_recv_cb", @@ -5849,7 +5849,7 @@ ibdm_saa_event_cb(ibmf_saa_handle_t ibmf_saa_handle, if (node_gid_info == NULL) { if (taskq_dispatch(system_taskq, ibdm_saa_handle_new_gid, (void *)gid_info, - TQ_NOSLEEP) == NULL) { + TQ_NOSLEEP) == TASKQID_INVALID) { IBTF_DPRINTF_L2("ibdm", "\tsaa_event_cb: " "new_gid taskq_dispatch failed"); return; @@ -5901,7 +5901,7 @@ ibdm_saa_event_cb(ibmf_saa_handle_t ibmf_saa_handle, event_arg->callback_arg = callback_arg; if (taskq_dispatch(system_taskq, ibdm_saa_event_taskq, - (void *)event_arg, TQ_NOSLEEP) == NULL) { + (void *)event_arg, TQ_NOSLEEP) == TASKQID_INVALID) { IBTF_DPRINTF_L2("ibdm", "\tsaa_event_cb: " "taskq_dispatch failed"); ibdm_free_saa_event_arg(event_arg); diff --git a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_recv.c b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_recv.c index 255298f986..b8c4297c3e 100644 --- a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_recv.c +++ b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_recv.c @@ -309,7 +309,7 @@ ibmf_i_handle_recv_completion(ibmf_ci_t *cip, ibt_wc_t *wcp) /* Dispatch the taskq thread to do further processing */ ret = taskq_dispatch(clientp->ic_recv_taskq, ibmf_i_do_recv_cb, recv_wqep, TQ_NOSLEEP); - if (ret == 0) { + if (ret == TASKQID_INVALID) { mutex_enter(&clientp->ic_kstat_mutex); IBMF_SUB32_KSTATS(clientp, recv_cb_active, 1); mutex_exit(&clientp->ic_kstat_mutex); @@ -391,7 +391,7 @@ ibmf_i_handle_recv_completion(ibmf_ci_t *cip, ibt_wc_t *wcp) modlargsp->ibmf_class = class; ret = taskq_dispatch(ibmf_statep->ibmf_taskq, ibmf_module_load, modlargsp, TQ_NOSLEEP); - if (ret == 0) { + if (ret == TASKQID_INVALID) { kmem_free(modlargsp, sizeof (ibmf_mod_load_args_t)); IBMF_TRACE_0(IBMF_TNF_DEBUG, DPRINT_L4, diff --git a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_saa_events.c b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_saa_events.c index cacb16fd4c..d5ce8491fd 100644 --- a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_saa_events.c +++ b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_saa_events.c @@ -970,7 +970,7 @@ ibmf_saa_notify_event_clients(saa_port_t *saa_portp, status = taskq_dispatch(saa_statep->saa_event_taskq, ibmf_saa_notify_event_client_task, event_taskq_args, KM_NOSLEEP); - if (status == 0) { + if (status == TASKQID_INVALID) { IBMF_TRACE_2(IBMF_TNF_NODEBUG, DPRINT_L1, ibmf_saa_notify_event_clients_err, IBMF_TNF_ERROR, diff --git a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_send.c b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_send.c index dcdba756b2..7265dd018e 100644 --- a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_send.c +++ b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_send.c @@ -364,7 +364,7 @@ ibmf_i_handle_send_completion(ibmf_ci_t *cip, ibt_wc_t *wcp) if ((clientp->ic_reg_flags & IBMF_REG_FLAG_NO_OFFLOAD) == 0) { ret = taskq_dispatch(cclientp->ic_send_taskq, ibmf_i_do_send_cb, send_wqep, TQ_NOSLEEP); - if (ret == 0) { + if (ret == TASKQID_INVALID) { IBMF_TRACE_1(IBMF_TNF_DEBUG, DPRINT_L4, ibmf_i_handle_send_err, IBMF_TNF_ERROR, "", "ibmf_i_handle_send_completion(): %s\n", diff --git a/usr/src/uts/common/io/idm/idm.c b/usr/src/uts/common/io/idm/idm.c index 23bdb1c44a..9951a74684 100644 --- a/usr/src/uts/common/io/idm/idm.c +++ b/usr/src/uts/common/io/idm/idm.c @@ -256,7 +256,7 @@ idm_ini_conn_destroy(idm_conn_t *ic) mutex_exit(&idm.idm_global_mutex); if (taskq_dispatch(idm.idm_global_taskq, - &idm_ini_conn_destroy_task, ic, TQ_SLEEP) == NULL) { + &idm_ini_conn_destroy_task, ic, TQ_SLEEP) == TASKQID_INVALID) { cmn_err(CE_WARN, "idm_ini_conn_destroy: Couldn't dispatch task"); } @@ -2180,7 +2180,8 @@ idm_refcnt_rele(idm_refcnt_t *refcnt) if (refcnt->ir_refcnt == 0) { if (refcnt->ir_waiting == REF_WAIT_ASYNC) { if (taskq_dispatch(idm.idm_global_taskq, - &idm_refcnt_unref_task, refcnt, TQ_SLEEP) == NULL) { + &idm_refcnt_unref_task, refcnt, TQ_SLEEP) == + TASKQID_INVALID) { cmn_err(CE_WARN, "idm_refcnt_rele: Couldn't dispatch task"); } @@ -2208,7 +2209,7 @@ 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) == NULL) { + &idm_refcnt_unref_task, refcnt, TQ_SLEEP) == TASKQID_INVALID) { cmn_err(CE_WARN, "idm_refcnt_rele: Couldn't dispatch task"); } @@ -2241,7 +2242,8 @@ idm_refcnt_async_wait_ref(idm_refcnt_t *refcnt, idm_refcnt_cb_t *cb_func) */ if (refcnt->ir_refcnt == 0) { if (taskq_dispatch(idm.idm_global_taskq, - &idm_refcnt_unref_task, refcnt, TQ_SLEEP) == NULL) { + &idm_refcnt_unref_task, refcnt, TQ_SLEEP) == + TASKQID_INVALID) { cmn_err(CE_WARN, "idm_refcnt_async_wait_ref: " "Couldn't dispatch task"); diff --git a/usr/src/uts/common/io/pciex/hotplug/pciehpc.c b/usr/src/uts/common/io/pciex/hotplug/pciehpc.c index 2100646260..94a32abf1b 100644 --- a/usr/src/uts/common/io/pciex/hotplug/pciehpc.c +++ b/usr/src/uts/common/io/pciex/hotplug/pciehpc.c @@ -2225,8 +2225,8 @@ pciehpc_handle_power_fault(dev_info_t *dip) */ ndi_hold_devi(dip); - if (!taskq_dispatch(system_taskq, pciehpc_power_fault_handler, dip, - TQ_NOSLEEP)) { + if (taskq_dispatch(system_taskq, pciehpc_power_fault_handler, dip, + TQ_NOSLEEP) == TASKQID_INVALID) { ndi_rele_devi(dip); PCIE_DBG("pciehpc_intr(): " "Failed to dispatch power fault handler, dip %p\n", dip); diff --git a/usr/src/uts/common/io/sata/impl/sata.c b/usr/src/uts/common/io/sata/impl/sata.c index 29b7cf2005..55da099035 100644 --- a/usr/src/uts/common/io/sata/impl/sata.c +++ b/usr/src/uts/common/io/sata/impl/sata.c @@ -2533,12 +2533,12 @@ sata_scsi_start(struct scsi_address *ap, struct scsi_pkt *pkt) if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == - NULL) { + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -3259,12 +3259,12 @@ sata_txlt_generic_pkt_info(sata_pkt_txlate_t *spx, int *reason, int flag) if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == - NULL) { + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -3485,12 +3485,13 @@ sata_txlt_invalid_command(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -3534,12 +3535,13 @@ sata_txlt_check_condition(sata_pkt_txlate_t *spx, uchar_t key, uchar_t code) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -3584,12 +3586,13 @@ sata_txlt_nodata_cmd_immediate(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -3911,12 +3914,13 @@ done: if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -4061,12 +4065,13 @@ sata_txlt_request_sense(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -4154,12 +4159,13 @@ sata_txlt_test_unit_ready(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -4488,12 +4494,13 @@ err_out: if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -4603,12 +4610,13 @@ sata_txlt_read_capacity(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -4785,12 +4793,13 @@ sata_txlt_read_capacity16(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -5234,12 +5243,13 @@ done: if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -5563,12 +5573,13 @@ done: if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -6065,12 +6076,13 @@ done: if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -6799,12 +6811,13 @@ bad_param: if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -7226,12 +7239,13 @@ sata_txlt_lba_out_of_range(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -7368,12 +7382,13 @@ sata_txlt_ata_pass_thru_illegal_cmd(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -7402,7 +7417,7 @@ sata_txlt_unmap_nodata_cmd(sata_pkt_txlate_t *spx) /* scsi callback required */ if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } @@ -7431,12 +7446,13 @@ sata_emul_rw_completion(sata_pkt_txlate_t *spx) if (servicing_interrupt()) { if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_NOSLEEP) == + TASKQID_INVALID) { return (TRAN_BUSY); } } else if (taskq_dispatch(SATA_TXLT_TASKQ(spx), (task_func_t *)spx->txlt_scsi_pkt->pkt_comp, - (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == NULL) { + (void *)spx->txlt_scsi_pkt, TQ_SLEEP) == TASKQID_INVALID) { /* Scheduling the callback failed */ return (TRAN_BUSY); } diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c index d996c5f867..32417c2e4e 100644 --- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c +++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c @@ -1164,7 +1164,7 @@ vhci_scsi_start(struct scsi_address *ap, struct scsi_pkt *pkt) if (!(vpkt->vpkt_state & VHCI_PKT_THRU_TASKQ)) { if (taskq_dispatch(vhci->vhci_taskq, vhci_dispatch_scsi_start, (void *) vpkt, - KM_NOSLEEP)) { + KM_NOSLEEP) != TASKQID_INVALID) { return (TRAN_ACCEPT); } else { return (TRAN_BUSY); @@ -2964,7 +2964,7 @@ vhci_do_prin(struct vhci_pkt **intr_vpkt) * Dispatch the retry command */ if (taskq_dispatch(vhci->vhci_taskq, vhci_dispatch_scsi_start, - (void *) new_vpkt, KM_NOSLEEP) == NULL) { + (void *) new_vpkt, KM_NOSLEEP) == TASKQID_INVALID) { if (path_holder) { vpkt->vpkt_path = path_holder; mdi_hold_path(path_holder); diff --git a/usr/src/uts/common/io/scsi/targets/sd.c b/usr/src/uts/common/io/scsi/targets/sd.c index 95f0b3b82a..3d6deb02b1 100644 --- a/usr/src/uts/common/io/scsi/targets/sd.c +++ b/usr/src/uts/common/io/scsi/targets/sd.c @@ -13466,7 +13466,7 @@ sd_mapblocksize_iodone(int index, struct sd_lun *un, struct buf *bp) * with the shadow buf at that point. */ if (taskq_dispatch(sd_wmr_tq, sd_read_modify_write_task, bp, - KM_NOSLEEP) != 0) { + KM_NOSLEEP) != TASKQID_INVALID) { /* * Dispatch was successful so we are done. Return * without going any higher up the iodone chain. Do @@ -18793,7 +18793,7 @@ sd_sense_key_unit_attention(struct sd_lun *un, uint8_t *sense_datap, #ifdef _LP64 if (un->un_blockcount + 1 > SD_GROUP1_MAX_ADDRESS) { if (taskq_dispatch(sd_tq, sd_reenable_dsense_task, - un, KM_NOSLEEP) == 0) { + un, KM_NOSLEEP) == TASKQID_INVALID) { /* * If we can't dispatch the task we'll just * live without descriptor sense. We can @@ -18824,7 +18824,7 @@ sd_sense_key_unit_attention(struct sd_lun *un, uint8_t *sense_datap, * encountered at a later time.) */ if (taskq_dispatch(sd_tq, sd_media_change_task, pktp, - KM_NOSLEEP) == 0) { + KM_NOSLEEP) == TASKQID_INVALID) { /* * Cannot dispatch the request so fail the command. */ @@ -18870,7 +18870,7 @@ sd_sense_key_unit_attention(struct sd_lun *un, uint8_t *sense_datap, ((asc == 0x2a) && (ascq == 0x01)) || ((asc == 0x3f) && (ascq == 0x0e))) { if (taskq_dispatch(sd_tq, sd_target_change_task, un, - KM_NOSLEEP) == 0) { + KM_NOSLEEP) == TASKQID_INVALID) { SD_ERROR(SD_LOG_ERROR, un, "sd_sense_key_unit_attention: " "Could not dispatch sd_target_change_task\n"); diff --git a/usr/src/uts/common/io/scsi/targets/sd_xbuf.c b/usr/src/uts/common/io/scsi/targets/sd_xbuf.c index be464d657c..9e9d1f283d 100644 --- a/usr/src/uts/common/io/scsi/targets/sd_xbuf.c +++ b/usr/src/uts/common/io/scsi/targets/sd_xbuf.c @@ -566,7 +566,8 @@ xbuf_dispatch(ddi_xbuf_attr_t xap) * schedule a timeout(9F) callback to try again later. */ if (taskq_dispatch(xap->xa_tq, - (void (*)(void *)) xbuf_iostart, xap, KM_NOSLEEP) == 0) { + (void (*)(void *)) xbuf_iostart, xap, KM_NOSLEEP) == + TASKQID_INVALID) { /* * Unable to enqueue the request for the taskq thread, * try again later. Note that this will keep re-trying diff --git a/usr/src/uts/common/io/softmac/softmac_fp.c b/usr/src/uts/common/io/softmac/softmac_fp.c index 2fc66e9bd3..44f7e94bee 100644 --- a/usr/src/uts/common/io/softmac/softmac_fp.c +++ b/usr/src/uts/common/io/softmac/softmac_fp.c @@ -852,7 +852,8 @@ softmac_taskq_dispatch(void) sup->su_taskq_scheduled = B_FALSE; mutex_exit(&softmac_taskq_lock); VERIFY(taskq_dispatch(system_taskq, - softmac_wput_nondata_task, sup, TQ_SLEEP) != NULL); + softmac_wput_nondata_task, sup, TQ_SLEEP) != + TASKQID_INVALID); mutex_enter(&softmac_taskq_lock); sup = list_head(&softmac_taskq_list); } @@ -893,7 +894,7 @@ softmac_wput_nondata(softmac_upper_t *sup, mblk_t *mp) mutex_exit(&sup->su_disp_mutex); if (taskq_dispatch(system_taskq, softmac_wput_nondata_task, - sup, TQ_NOSLEEP) != NULL) { + sup, TQ_NOSLEEP) != TASKQID_INVALID) { return; } diff --git a/usr/src/uts/common/io/usb/usba/hcdi.c b/usr/src/uts/common/io/usb/usba/hcdi.c index f6cbf0b212..385dfcaccc 100644 --- a/usr/src/uts/common/io/usb/usba/hcdi.c +++ b/usr/src/uts/common/io/usb/usba/hcdi.c @@ -564,7 +564,7 @@ usba_hcdi_cb(usba_pipe_handle_data_t *ph_data, usb_opaque_t req, } if (taskq_dispatch(usba_device->usb_shared_taskq[iface], hcdi_shared_cb_thread, req_wrp, TQ_NOSLEEP) == - NULL) { + TASKQID_INVALID) { usba_req_exc_cb(req_wrp, USB_CR_NO_RESOURCES, USB_CB_ASYNC_REQ_FAILED); } diff --git a/usr/src/uts/common/io/usb/usba/usbai_util.c b/usr/src/uts/common/io/usb/usba/usbai_util.c index 17711e0d7b..dd942e35f2 100644 --- a/usr/src/uts/common/io/usb/usba/usbai_util.c +++ b/usr/src/uts/common/io/usb/usba/usbai_util.c @@ -1691,8 +1691,8 @@ usb_async_req(dev_info_t *dip, tq_flag |= TQ_NOQUEUE; } - if (!taskq_dispatch(system_taskq, func, (void *)arg, - tq_flag)) { + if (taskq_dispatch(system_taskq, func, arg, + tq_flag) == TASKQID_INVALID) { USB_DPRINTF_L2(DPRINT_MASK_USBA, usbai_log_handle, "usb_async_req: failure"); @@ -1747,7 +1747,7 @@ usba_async_ph_req(usba_pipe_handle_data_t *ph_data, tq_flag |= TQ_NOQUEUE; } - if (!taskq_dispatch(taskq, func, (void *)arg, tq_flag)) { + if (taskq_dispatch(taskq, func, arg, tq_flag) == TASKQID_INVALID) { USB_DPRINTF_L2(DPRINT_MASK_USBA, usbai_log_handle, "usba_async_ph_req: failure"); |