aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-20 17:30:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:38:41 -0800
commit8992551d85934e0dc4683068612758831d1d4899 (patch)
tree6062a1b0e92bbc7ac8268a3e494e23536ed096d1 /net
parent63c1362476141f4fb340e8236d41674be9fc1983 (diff)
libceph: clear all flags on con_close
Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 43c7427d100769451601b8a36988ac0528ce0124)
Diffstat (limited to 'net')
-rw-r--r--net/ceph/messenger.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index ca703f131e9..e97bb59db1a 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -528,6 +528,8 @@ void ceph_con_close(struct ceph_connection *con)
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;