From: Amir Vadai Date: Mon, 6 Feb 2017 17:32:27 +0000 (+0200) Subject: msg/async/rdma: Change port num into int to be printed properly X-Git-Tag: v12.0.1~66^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6a90ae36c4ab7d8d4c89bb88ec27d1df2120c6f0;p=ceph.git msg/async/rdma: Change port num into int to be printed properly Issue: 995322 Change-Id: If3095f2cc257cfe110652adca4a6175644c0230e Signed-off-by: Amir Vadai --- diff --git a/src/msg/async/rdma/Infiniband.cc b/src/msg/async/rdma/Infiniband.cc index a0ef4a7857334..25811e2000156 100644 --- a/src/msg/async/rdma/Infiniband.cc +++ b/src/msg/async/rdma/Infiniband.cc @@ -125,7 +125,7 @@ Device::Device(CephContext *cct, ibv_device* d): device(d), device_attr(new ibv_ } } -void Device::binding_port(CephContext *cct, uint8_t port_num) { +void Device::binding_port(CephContext *cct, int port_num) { port_cnt = device_attr->phys_port_cnt; for (uint8_t i = 0; i < port_cnt; ++i) { Port *port = new Port(cct, ctxt, i+1); diff --git a/src/msg/async/rdma/Infiniband.h b/src/msg/async/rdma/Infiniband.h index 325ff39868888..bfab33f9491a5 100644 --- a/src/msg/async/rdma/Infiniband.h +++ b/src/msg/async/rdma/Infiniband.h @@ -47,7 +47,7 @@ class CephContext; class Port { struct ibv_context* ctxt; - uint8_t port_num; + int port_num; struct ibv_port_attr* port_attr; uint16_t lid; int gid_idx; @@ -57,7 +57,7 @@ class Port { explicit Port(CephContext *cct, struct ibv_context* ictxt, uint8_t ipn); uint16_t get_lid() { return lid; } ibv_gid get_gid() { return gid; } - uint8_t get_port_num() { return port_num; } + int get_port_num() { return port_num; } ibv_port_attr* get_port_attr() { return port_attr; } int get_gid_idx() { return gid_idx; } }; @@ -79,7 +79,7 @@ class Device { uint16_t get_lid() { return active_port->get_lid(); } ibv_gid get_gid() { return active_port->get_gid(); } int get_gid_idx() { return active_port->get_gid_idx(); } - void binding_port(CephContext *c, uint8_t port_num); + void binding_port(CephContext *c, int port_num); struct ibv_context *ctxt; ibv_device_attr *device_attr; Port* active_port;