From: Avner BenHanoch Date: Mon, 11 Apr 2016 11:26:40 +0000 (+0300) Subject: xio: refactor flush_input_queue -> flush_out_queues X-Git-Tag: v10.2.0~22^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=262d85c2cb489946b84ea6703b9ec074c222cf70;p=ceph.git xio: refactor flush_input_queue -> flush_out_queues avoid misleading names Signed-off-by: Avner BenHanoch --- diff --git a/src/msg/xio/XioConnection.cc b/src/msg/xio/XioConnection.cc index 8558b51b3c1b..091dc4e143f6 100644 --- a/src/msg/xio/XioConnection.cc +++ b/src/msg/xio/XioConnection.cc @@ -477,7 +477,7 @@ void XioConnection::msg_release_fail(struct xio_msg *msg, int code) " (" << xio_strerror(code) << ")" << dendl; } /* msg_release_fail */ -int XioConnection::flush_input_queue(uint32_t flags) { +int XioConnection::flush_out_queues(uint32_t flags) { XioMessenger* msgr = static_cast(get_messenger()); if (! (flags & CState::OP_FLAG_LOCKED)) pthread_spin_lock(&sp); @@ -640,7 +640,7 @@ int XioConnection::CState::state_up_ready(uint32_t flags) if (! (flags & CState::OP_FLAG_LOCKED)) pthread_spin_lock(&xcon->sp); - xcon->flush_input_queue(flags|CState::OP_FLAG_LOCKED); + xcon->flush_out_queues(flags|CState::OP_FLAG_LOCKED); session_state.set(UP); startup_state.set(READY); diff --git a/src/msg/xio/XioConnection.h b/src/msg/xio/XioConnection.h index e19b3f5dfdb6..e55ea983197e 100644 --- a/src/msg/xio/XioConnection.h +++ b/src/msg/xio/XioConnection.h @@ -319,7 +319,7 @@ public: struct xio_msg *msg, void *conn_user_context); void msg_send_fail(XioMsg *xmsg, int code); void msg_release_fail(struct xio_msg *msg, int code); - int flush_input_queue(uint32_t flags); + int flush_out_queues(uint32_t flags); int discard_input_queue(uint32_t flags); int adjust_clru(uint32_t flags); };