From 09a49861e64d1be1970e4e23a41f1bf17dfd6d15 Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Thu, 29 Dec 2016 23:50:31 +0800 Subject: [PATCH] msg/async/rdma: fix ceph_clock_now calls Signed-off-by: Haomai Wang --- src/msg/async/rdma/RDMAStack.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc index 2a81a5a7931..4d5c5077d75 100644 --- a/src/msg/async/rdma/RDMAStack.cc +++ b/src/msg/async/rdma/RDMAStack.cc @@ -252,7 +252,7 @@ void RDMADispatcher::polling() RDMAWorker* worker; ldout(cct, 20) << __func__ << " going to poll rx cq:" << rx_cq << dendl; RDMAConnectedSocketImpl *conn = nullptr; - utime_t last_inactive = ceph_clock_now(cct); + utime_t last_inactive = ceph_clock_now(); bool rearmed = false; while (true) { @@ -275,7 +275,7 @@ void RDMADispatcher::polling() if (done) break; - if ((ceph_clock_now(cct) - last_inactive).to_nsec() / 1000 > cct->_conf->ms_async_rdma_polling_us) { + if ((ceph_clock_now() - last_inactive).to_nsec() / 1000 > cct->_conf->ms_async_rdma_polling_us) { if (!rearmed) { // Clean up cq events after rearm notify ensure no new incoming event // arrived between polling and rearm @@ -299,7 +299,7 @@ void RDMADispatcher::polling() } if (r > 0 && rx_cc->get_cq_event()) ldout(cct, 20) << __func__ << " got cq event." << dendl; - last_inactive = ceph_clock_now(cct); + last_inactive = ceph_clock_now(); rearmed = false; } continue;