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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ib/clients/rdsv3/af_rds.c
          +++ new/usr/src/uts/common/io/ib/clients/rdsv3/af_rds.c
↓ open down ↓ 753 lines elided ↑ open up ↑
 754  754  
 755  755  void
 756  756  rdsv3_clrflowctrl(sock_lower_handle_t proto_handle)
 757  757  {
 758  758          struct rsock *sk = (struct rsock *)proto_handle;
 759  759          struct rdsv3_sock *rs = rdsv3_sk_to_rs(sk);
 760  760  
 761  761          RDSV3_DPRINTF2("rdsv3_clrflowctrl", "enter(rs: %p)", rs);
 762  762  }
 763  763  
 764      -#ifndef __lock_lint
 765  764  static struct sock_downcalls_s rdsv3_sock_downcalls = {
 766  765          .sd_close =             rdsv3_release,
 767  766          .sd_bind =              rdsv3_bind,
 768  767          .sd_connect =           rdsv3_connect,
 769  768          .sd_accept =            NULL,
 770  769          .sd_getsockname =       rdsv3_getname,
 771  770          .sd_poll =              rdsv3_poll,
 772  771          .sd_ioctl =             rdsv3_ioctl,
 773  772          .sd_listen =            NULL,
 774  773          .sd_shutdown =          rdsv3_shutdown,
 775  774          .sd_setsockopt =        rdsv3_setsockopt,
 776  775          .sd_getsockopt =        rdsv3_getsockopt,
 777  776          .sd_send_uio =          rdsv3_send_uio,
 778  777          .sd_recv_uio =          rdsv3_recv_uio,
 779  778          .sd_activate =          rdsv3_activate,
 780  779          .sd_getpeername =       rdsv3_getpeername,
 781  780          .sd_send =              NULL,
 782  781          .sd_clr_flowctrl =      NULL
 783  782  };
 784      -#else
 785      -static struct sock_downcalls_s rdsv3_sock_downcalls = {
 786      -        rdsv3_activate,
 787      -        NULL,
 788      -        rdsv3_bind,
 789      -        NULL,
 790      -        rdsv3_connect,
 791      -        rdsv3_getpeername,
 792      -        rdsv3_getname,
 793      -        rdsv3_getsockopt,
 794      -        rdsv3_setsockopt,
 795      -        NULL,
 796      -        rdsv3_send_uio,
 797      -        rdsv3_recv_uio,
 798      -        rdsv3_poll,
 799      -        rdsv3_shutdown,
 800      -        NULL,
 801      -        rdsv3_ioctl,
 802      -        rdsv3_release
 803      -};
 804      -#endif
 805  783  
 806  784  sock_lower_handle_t
 807  785  rdsv3_create(int family, int type, int proto, sock_downcalls_t **sock_downcalls,
 808  786      uint_t *smodep, int *errorp, int flags, cred_t *credp)
 809  787  {
 810  788          struct rdsv3_sock       *rs;
 811  789          struct rsock            *sk;
 812  790  
 813  791          RDSV3_DPRINTF4("rdsv3_create", "Enter (family: %d type: %d, proto: %d "
 814  792              "flags: %d", family, type, proto, flags);
↓ open down ↓ 142 lines elided ↑ open up ↑
 957  935  {
 958  936          RDSV3_DPRINTF4("rdsv3_exit", "Enter");
 959  937  
 960  938          if (rdsv3_rdma_dwp) {
 961  939                  rdsv3_cancel_delayed_work(rdsv3_rdma_dwp);
 962  940          }
 963  941  
 964  942          (void) ddi_taskq_dispatch(rdsv3_taskq, rdsv3_rdma_exit,
 965  943              NULL, DDI_SLEEP);
 966  944          while (rdsv3_rdma_listen_id != NULL) {
 967      -#ifndef __lock_lint
 968  945                  RDSV3_DPRINTF5("rdsv3", "%s-%d Waiting for rdsv3_rdma_exit",
 969  946                      __func__, __LINE__);
 970      -#endif
 971  947                  delay(drv_usectohz(1000));
 972  948          }
 973  949  
 974  950          rdsv3_conn_exit();
 975  951          rdsv3_cong_exit();
 976  952          rdsv3_sysctl_exit();
 977  953          rdsv3_threads_exit();
 978  954          rdsv3_stats_exit();
 979  955          rdsv3_info_deregister_func(RDS_INFO_SOCKETS, rdsv3_sock_info);
 980  956          rdsv3_info_deregister_func(RDS_INFO_RECV_MESSAGES,
↓ open down ↓ 58 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX