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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ib/ibtl/ibtl_cm.c
          +++ new/usr/src/uts/common/io/ib/ibtl/ibtl_cm.c
↓ open down ↓ 76 lines elided ↑ open up ↑
  77   77   *      A helper function to get CM's Private data for the specified channel.
  78   78   */
  79   79  void *
  80   80  ibtl_cm_get_chan_private(ibt_channel_hdl_t chan)
  81   81  {
  82   82          void *cm_private;
  83   83  
  84   84          IBTF_DPRINTF_L3(ibtf_cm, "ibtl_cm_get_chan_private(%p)", chan);
  85   85          mutex_enter(&chan->ch_cm_mutex);
  86   86          cm_private = chan->ch_cm_private;
  87      -#ifndef __lock_lint
  88   87          /* IBCM will call the release function if cm_private is non-NULL */
  89   88          if (cm_private == NULL)
  90      -#endif
  91   89                  mutex_exit(&chan->ch_cm_mutex);
  92   90          return (cm_private);
  93   91  }
  94   92  
  95   93  void
  96   94  ibtl_cm_release_chan_private(ibt_channel_hdl_t chan)
  97   95  {
  98      -#ifndef __lock_lint
  99   96          mutex_exit(&chan->ch_cm_mutex);
 100      -#endif
 101   97  }
 102   98  
 103   99  void
 104  100  ibtl_cm_wait_chan_private(ibt_channel_hdl_t chan)
 105  101  {
 106  102          mutex_enter(&chan->ch_cm_mutex);
 107  103          if (chan->ch_cm_private != NULL)
 108  104                  cv_wait(&chan->ch_cm_cv, &chan->ch_cm_mutex);
 109  105          mutex_exit(&chan->ch_cm_mutex);
 110  106          delay(drv_usectohz(50000));
↓ open down ↓ 392 lines elided ↑ open up ↑
 503  499          retval = ibtl_cm_get_cnt(attr, flags, p_listp, &rcount);
 504  500          mutex_exit(&ibtl_clnt_list_mutex);
 505  501          if (retval != IBT_SUCCESS) {
 506  502                  kmem_free(p_listp, count * sizeof (ibtl_cm_port_list_t));
 507  503                  *port_list_p = NULL;
 508  504                  return (retval);
 509  505          }
 510  506  
 511  507          p_listp = *port_list_p;
 512  508  
 513      -        _NOTE(NO_COMPETING_THREADS_NOW)
 514      -
 515  509          for (i = 0; i < count - 1; i++) {
 516  510                  for (j = 0; j < count - 1 - i; j++) {
 517  511                          if (p_listp[j].p_hca_guid != p_listp[j+1].p_hca_guid) {
 518  512                                  multi_hca = B_TRUE;
 519  513                                  break;
 520  514                          }
 521  515                  }
 522  516                  if (multi_hca == B_TRUE)
 523  517                          break;
 524  518          }
↓ open down ↓ 44 lines elided ↑ open up ↑
 569  563                  for (i = 1; i < count; i++) {
 570  564                          if (p_listp[i].p_sgid.gid_guid ==
 571  565                              attr->pa_sgid.gid_guid) {
 572  566                                  tmp = p_listp[i];
 573  567                                  p_listp[i] = p_listp[0];
 574  568                                  p_listp[0] = tmp;
 575  569                          }
 576  570                  }
 577  571          }
 578  572  
 579      -#ifndef lint
 580      -        _NOTE(COMPETING_THREADS_NOW)
 581      -#endif
 582      -
 583  573          IBTF_DPRINTF_L3(ibtf_cm, "ibtl_cm_get_active_plist: "
 584  574              "Returned <%d> entries @0x%p", count, *port_list_p);
 585  575  
 586  576          return (retval);
 587  577  }
 588  578  
 589  579  
 590  580  void
 591  581  ibtl_cm_free_active_plist(ibtl_cm_port_list_t *plist)
 592  582  {
 593  583          int count;
 594  584  
 595  585          IBTF_DPRINTF_L3(ibtf_cm, "ibtl_cm_free_active_plist(%p)", plist);
 596  586  
 597  587          if (plist != NULL) {
 598      -                _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*plist))
 599  588                  count = plist->p_count;
 600      -                _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*plist))
 601      -
 602  589                  kmem_free(plist, count * sizeof (ibtl_cm_port_list_t));
 603  590          }
 604  591  }
 605  592  
 606  593  /*
 607  594   * Function:
 608  595   *      ibtl_cm_get_1st_full_pkey_ix
 609  596   * Input:
 610  597   *      hca_guid        HCA GUID.
 611  598   *      port            Port Number.
↓ open down ↓ 165 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX