8368 remove warlock leftovers from usr/src/uts

@@ -2255,20 +2255,17 @@
         int                     rval;
         uint32_t                *d_id;
         fc_remote_port_t        *pd;
         job_request_t           *job;
 
-#ifndef __lock_lint
         /*
          * Solaris-internal stuff for proper operation of kernel threads
          * with Solaris CPR.
          */
         CALLB_CPR_INIT(&port->fp_cpr_info, &port->fp_mutex,
             callb_generic_cpr, "fp_job_handler");
-#endif
 
-
         /* Loop forever waiting for work to do */
         for (;;) {
 
                 mutex_enter(&port->fp_mutex);
 

@@ -2306,15 +2303,11 @@
                         fp_port_shutdown(port, job);
 
                         /*
                          * This will exit the job thread.
                          */
-#ifndef __lock_lint
                         CALLB_CPR_EXIT(&(port->fp_cpr_info));
-#else
-                        mutex_exit(&port->fp_mutex);
-#endif
                         fctl_jobdone(job);
                         thread_exit();
 
                         /* NOTREACHED */
 

@@ -2454,13 +2447,11 @@
                          * PLOGOs to different remote ports may occur in
                          * parallel.
                          */
                         fc_remote_port_t *pd;
 
-#ifndef __lock_lint
                         ASSERT(job->job_counter > 0);
-#endif
 
                         pd = (fc_remote_port_t *)job->job_ulp_pkts;
 
                         mutex_enter(&pd->pd_mutex);
                         if (pd->pd_state != PORT_DEVICE_LOGGED_IN) {

@@ -4214,14 +4205,12 @@
 
         pd->pd_state = PORT_DEVICE_LOGGED_IN;
         pd->pd_login_class = class;
         mutex_exit(&pd->pd_mutex);
 
-#ifndef __lock_lint
         ASSERT(fctl_get_remote_port_by_did(pd->pd_port,
             pd->pd_port_id.port_id) == pd);
-#endif
 
         mutex_enter(&node->fd_mutex);
         if (handle) {
                 FC_GET_RSP(pd->pd_port, *handle, (uint8_t *)node->fd_vv,
                     (uint8_t *)acc->vendor_version, sizeof (node->fd_vv),

@@ -6024,13 +6013,11 @@
         nl_port = 0;
         cmd = pkt->pkt_ulp_private;
         port = cmd->cmd_port;
         d_id = pkt->pkt_cmd_fhdr.d_id;
 
-#ifndef __lock_lint
         ASSERT(cmd->cmd_job && cmd->cmd_job->job_counter);
-#endif
 
         FP_TRACE(FP_NHEAD1(3, 0), "fp_plogi_intr: port=%p, job=%p, d_id=%x,"
             " jcount=%d pkt=%p, state=%x", port, cmd->cmd_job, d_id,
             cmd->cmd_job->job_counter, pkt, pkt->pkt_state);
 

@@ -6524,13 +6511,11 @@
 
         pd = pkt->pkt_pd;
         cmd = pkt->pkt_ulp_private;
         port = cmd->cmd_port;
 
-#ifndef __lock_lint
         ASSERT(cmd->cmd_job && cmd->cmd_job->job_counter);
-#endif
 
         ASSERT(pd != NULL && port != NULL && cmd != NULL);
 
         mutex_enter(&port->fp_mutex);
         port->fp_out_fpcmds--;