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/ib.c
          +++ new/usr/src/uts/common/io/ib/clients/rdsv3/ib.c
↓ open down ↓ 217 lines elided ↑ open up ↑
 218  218  
 219  219          rdsv3_ib_destroy_mr_pool(rds_ibdev);
 220  220          rdsv3_ib_destroy_inc_pool(rds_ibdev);
 221  221  
 222  222          kmem_cache_destroy(rds_ibdev->ib_frag_slab);
 223  223  
 224  224          rdsv3_af_grp_destroy(rds_ibdev->aft_hcagp);
 225  225  
 226  226  #if 0
 227  227          while (ib_dealloc_pd(rds_ibdev->pd)) {
 228      -#ifndef __lock_lint
 229  228                  RDSV3_DPRINTF5("rdsv3_ib_remove_one",
 230  229                      "%s-%d Failed to dealloc pd %p",
 231  230                      __func__, __LINE__, rds_ibdev->pd);
 232      -#endif
 233  231                  delay(drv_usectohz(1000));
 234  232          }
 235  233  #else
 236  234          if (ib_dealloc_pd(rds_ibdev->pd)) {
 237      -#ifndef __lock_lint
 238  235                  RDSV3_DPRINTF2("rdsv3_ib_remove_one",
 239  236                      "Failed to dealloc pd %p\n", rds_ibdev->pd);
 240      -#endif
 241  237          }
 242  238  #endif
 243  239  
 244  240          list_destroy(&rds_ibdev->ipaddr_list);
 245  241          list_destroy(&rds_ibdev->conn_list);
 246  242          list_remove_node(&rds_ibdev->list);
 247  243          mutex_destroy(&rds_ibdev->spinlock);
 248  244          rw_destroy(&rds_ibdev->rwlock);
 249  245          kmem_free(rds_ibdev, sizeof (*rds_ibdev));
 250  246  
 251  247          RDSV3_DPRINTF2("rdsv3_ib_remove_one", "Return: device: %p", device);
 252  248  }
 253  249  
 254      -#ifndef __lock_lint
 255  250  struct ib_client rdsv3_ib_client = {
 256  251          .name           = "rdsv3_ib",
 257  252          .add            = rdsv3_ib_add_one,
 258  253          .remove         = rdsv3_ib_remove_one,
 259  254          .clnt_hdl       = NULL,
 260  255          .state          = IB_CLNT_UNINITIALIZED
 261  256  };
 262      -#else
 263      -struct ib_client rdsv3_ib_client = {
 264      -        "rdsv3_ib",
 265      -        rdsv3_ib_add_one,
 266      -        rdsv3_ib_remove_one,
 267      -        NULL,
 268      -        NULL,
 269      -        IB_CLNT_UNINITIALIZED
 270      -};
 271      -#endif
 272  257  
 273  258  static int
 274  259  rds_ib_conn_info_visitor(struct rdsv3_connection *conn,
 275  260      void *buffer)
 276  261  {
 277  262          struct rds_info_rdma_connection *iinfo = buffer;
 278  263          struct rdsv3_ib_connection *ic;
 279  264  
 280  265          RDSV3_DPRINTF4("rds_ib_conn_info_visitor", "conn: %p buffer: %p",
 281  266              conn, buffer);
↓ open down ↓ 105 lines elided ↑ open up ↑
 387  372          rdsv3_trans_unregister(&rdsv3_ib_transport);
 388  373          kmem_free(rdsv3_ib_stats,
 389  374              nr_cpus * sizeof (struct rdsv3_ib_statistics));
 390  375          mutex_destroy(&ib_nodev_conns_lock);
 391  376          list_destroy(&ib_nodev_conns);
 392  377          list_destroy(&rdsv3_ib_devices);
 393  378  
 394  379          RDSV3_DPRINTF4("rds_ib_exit", "Return");
 395  380  }
 396  381  
 397      -#ifndef __lock_lint
 398  382  struct rdsv3_transport rdsv3_ib_transport = {
 399  383          .laddr_check            = rds_ib_laddr_check,
 400  384          .xmit_complete          = rdsv3_ib_xmit_complete,
 401  385          .xmit                   = rdsv3_ib_xmit,
 402  386          .xmit_cong_map          = NULL,
 403  387          .xmit_rdma              = rdsv3_ib_xmit_rdma,
 404  388          .recv                   = rdsv3_ib_recv,
 405  389          .conn_alloc             = rdsv3_ib_conn_alloc,
 406  390          .conn_free              = rdsv3_ib_conn_free,
 407  391          .conn_connect           = rdsv3_ib_conn_connect,
↓ open down ↓ 5 lines elided ↑ open up ↑
 413  397          .cm_connect_complete    = rdsv3_ib_cm_connect_complete,
 414  398          .stats_info_copy        = rdsv3_ib_stats_info_copy,
 415  399          .exit                   = rdsv3_ib_exit,
 416  400          .get_mr                 = rdsv3_ib_get_mr,
 417  401          .sync_mr                = rdsv3_ib_sync_mr,
 418  402          .free_mr                = rdsv3_ib_free_mr,
 419  403          .flush_mrs              = rdsv3_ib_flush_mrs,
 420  404          .t_name                 = "infiniband",
 421  405          .t_type                 = RDS_TRANS_IB
 422  406  };
 423      -#else
 424      -struct rdsv3_transport rdsv3_ib_transport;
 425      -#endif
 426  407  
 427  408  int
 428  409  rdsv3_ib_init(void)
 429  410  {
 430  411          int ret;
 431  412  
 432  413          RDSV3_DPRINTF4("rds_ib_init", "Enter");
 433  414  
 434  415          list_create(&rdsv3_ib_devices, sizeof (struct rdsv3_ib_device),
 435  416              offsetof(struct rdsv3_ib_device, list));
↓ open down ↓ 46 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX