[ 156/171] libceph: revoke mon_client messages on session restart
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2012-11-22 18:38:37
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sage Weil <redacted> (cherry picked from commit 4f471e4a9c7db0256834e1b376ea50c82e345c3c) Revoke all mon_client messages when we shut down the old connection. This is mostly moot since we are re-using the same ceph_connection, but it is cleaner. Signed-off-by: Sage Weil <redacted> Reviewed-by: Alex Elder <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/ceph/mon_client.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c@@ -118,6 +118,9 @@ static void __close_session(struct ceph_ { dout("__close_session closing mon%d\n", monc->cur_mon); ceph_msg_revoke(monc->m_auth); + ceph_msg_revoke_incoming(monc->m_auth_reply); + ceph_msg_revoke(monc->m_subscribe); + ceph_msg_revoke_incoming(monc->m_subscribe_ack); ceph_con_close(&monc->con); monc->cur_mon = -1; monc->pending_auth = 0;
@@ -685,6 +688,7 @@ static void __resend_generic_request(str for (p = rb_first(&monc->generic_request_tree); p; p = rb_next(p)) { req = rb_entry(p, struct ceph_mon_generic_request, node); ceph_msg_revoke(req->request); + ceph_msg_revoke_incoming(req->reply); ceph_con_send(&monc->con, ceph_msg_get(req->request)); } }