[ 154/171] libceph: clear all flags on con_close
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2012-11-22 21:32:13
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ Signed-off-by: Sage Weil <redacted> (cherry picked from commit 43c7427d100769451601b8a36988ac0528ce0124) --- net/ceph/messenger.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c@@ -528,6 +528,8 @@ void ceph_con_close(struct ceph_connecti clear_bit(CON_FLAG_LOSSYTX, &con->flags); /* so we retry next connect */ clear_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags); clear_bit(CON_FLAG_WRITE_PENDING, &con->flags); + clear_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags); + clear_bit(CON_FLAG_BACKOFF, &con->flags); reset_connection(con); con->peer_global_seq = 0;