Print this page
8368 remove warlock leftovers from usr/src/uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/fibre-channel/impl/fp.c
          +++ new/usr/src/uts/common/io/fibre-channel/impl/fp.c
↓ open down ↓ 2249 lines elided ↑ open up ↑
2250 2250   * port basis; these also need to be taken into consideration.
2251 2251   */
2252 2252  static void
2253 2253  fp_job_handler(fc_local_port_t *port)
2254 2254  {
2255 2255          int                     rval;
2256 2256          uint32_t                *d_id;
2257 2257          fc_remote_port_t        *pd;
2258 2258          job_request_t           *job;
2259 2259  
2260      -#ifndef __lock_lint
2261 2260          /*
2262 2261           * Solaris-internal stuff for proper operation of kernel threads
2263 2262           * with Solaris CPR.
2264 2263           */
2265 2264          CALLB_CPR_INIT(&port->fp_cpr_info, &port->fp_mutex,
2266 2265              callb_generic_cpr, "fp_job_handler");
2267      -#endif
2268 2266  
2269      -
2270 2267          /* Loop forever waiting for work to do */
2271 2268          for (;;) {
2272 2269  
2273 2270                  mutex_enter(&port->fp_mutex);
2274 2271  
2275 2272                  /*
2276 2273                   * Sleep if no work to do right now, or if we want
2277 2274                   * to suspend or power-down.
2278 2275                   */
2279 2276                  while (port->fp_job_head == NULL ||
↓ open down ↓ 21 lines elided ↑ open up ↑
2301 2298                           * will prepare the local port instance (softstate)
2302 2299                           * for detaching.  This cancels timeout callbacks,
2303 2300                           * executes LOGOs with remote ports, cleans up tables,
2304 2301                           * and deallocates data structs.
2305 2302                           */
2306 2303                          fp_port_shutdown(port, job);
2307 2304  
2308 2305                          /*
2309 2306                           * This will exit the job thread.
2310 2307                           */
2311      -#ifndef __lock_lint
2312 2308                          CALLB_CPR_EXIT(&(port->fp_cpr_info));
2313      -#else
2314      -                        mutex_exit(&port->fp_mutex);
2315      -#endif
2316 2309                          fctl_jobdone(job);
2317 2310                          thread_exit();
2318 2311  
2319 2312                          /* NOTREACHED */
2320 2313  
2321 2314                  case JOB_ATTACH_ULP: {
2322 2315                          /*
2323 2316                           * This job is spawned in response to a ULP calling
2324 2317                           * fc_ulp_add().
2325 2318                           */
↓ open down ↓ 123 lines elided ↑ open up ↑
2449 2442                          break;
2450 2443  
2451 2444                  case JOB_LOGO_ONE: {
2452 2445                          /*
2453 2446                           * Issue a PLOGO to a single remote port. Multiple
2454 2447                           * PLOGOs to different remote ports may occur in
2455 2448                           * parallel.
2456 2449                           */
2457 2450                          fc_remote_port_t *pd;
2458 2451  
2459      -#ifndef __lock_lint
2460 2452                          ASSERT(job->job_counter > 0);
2461      -#endif
2462 2453  
2463 2454                          pd = (fc_remote_port_t *)job->job_ulp_pkts;
2464 2455  
2465 2456                          mutex_enter(&pd->pd_mutex);
2466 2457                          if (pd->pd_state != PORT_DEVICE_LOGGED_IN) {
2467 2458                                  mutex_exit(&pd->pd_mutex);
2468 2459                                  job->job_result = FC_LOGINREQ;
2469 2460                                  mutex_exit(&port->fp_mutex);
2470 2461                                  fctl_jobdone(job);
2471 2462                                  break;
↓ open down ↓ 1737 lines elided ↑ open up ↑
4209 4200                  pd->pd_csp = acc->common_service;
4210 4201                  pd->pd_clsp1 = acc->class_1;
4211 4202                  pd->pd_clsp2 = acc->class_2;
4212 4203                  pd->pd_clsp3 = acc->class_3;
4213 4204          }
4214 4205  
4215 4206          pd->pd_state = PORT_DEVICE_LOGGED_IN;
4216 4207          pd->pd_login_class = class;
4217 4208          mutex_exit(&pd->pd_mutex);
4218 4209  
4219      -#ifndef __lock_lint
4220 4210          ASSERT(fctl_get_remote_port_by_did(pd->pd_port,
4221 4211              pd->pd_port_id.port_id) == pd);
4222      -#endif
4223 4212  
4224 4213          mutex_enter(&node->fd_mutex);
4225 4214          if (handle) {
4226 4215                  FC_GET_RSP(pd->pd_port, *handle, (uint8_t *)node->fd_vv,
4227 4216                      (uint8_t *)acc->vendor_version, sizeof (node->fd_vv),
4228 4217                      DDI_DEV_AUTOINCR);
4229 4218          } else {
4230 4219                  bcopy(acc->vendor_version, node->fd_vv, sizeof (node->fd_vv));
4231 4220          }
4232 4221          mutex_exit(&node->fd_mutex);
↓ open down ↓ 1786 lines elided ↑ open up ↑
6019 6008          fc_remote_port_t        *pd;
6020 6009          la_wwn_t                nwwn;
6021 6010          la_wwn_t                pwwn;
6022 6011          ls_code_t               resp;
6023 6012  
6024 6013          nl_port = 0;
6025 6014          cmd = pkt->pkt_ulp_private;
6026 6015          port = cmd->cmd_port;
6027 6016          d_id = pkt->pkt_cmd_fhdr.d_id;
6028 6017  
6029      -#ifndef __lock_lint
6030 6018          ASSERT(cmd->cmd_job && cmd->cmd_job->job_counter);
6031      -#endif
6032 6019  
6033 6020          FP_TRACE(FP_NHEAD1(3, 0), "fp_plogi_intr: port=%p, job=%p, d_id=%x,"
6034 6021              " jcount=%d pkt=%p, state=%x", port, cmd->cmd_job, d_id,
6035 6022              cmd->cmd_job->job_counter, pkt, pkt->pkt_state);
6036 6023  
6037 6024          /*
6038 6025           * Bail out early on ULP initiated requests if the
6039 6026           * state change has occurred
6040 6027           */
6041 6028          mutex_enter(&port->fp_mutex);
↓ open down ↓ 477 lines elided ↑ open up ↑
6519 6506          la_els_adisc_t          *acc;
6520 6507          ls_code_t               resp;
6521 6508          fc_hardaddr_t           ha;
6522 6509          fc_portmap_t            *changelist;
6523 6510          int                     initiator, adiscfail = 0;
6524 6511  
6525 6512          pd = pkt->pkt_pd;
6526 6513          cmd = pkt->pkt_ulp_private;
6527 6514          port = cmd->cmd_port;
6528 6515  
6529      -#ifndef __lock_lint
6530 6516          ASSERT(cmd->cmd_job && cmd->cmd_job->job_counter);
6531      -#endif
6532 6517  
6533 6518          ASSERT(pd != NULL && port != NULL && cmd != NULL);
6534 6519  
6535 6520          mutex_enter(&port->fp_mutex);
6536 6521          port->fp_out_fpcmds--;
6537 6522          bailout = ((port->fp_statec_busy ||
6538 6523              FC_PORT_STATE_MASK(port->fp_state) == FC_STATE_OFFLINE) &&
6539 6524              cmd->cmd_ulp_pkt) ? 1 : 0;
6540 6525          mutex_exit(&port->fp_mutex);
6541 6526  
↓ open down ↓ 8864 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX