summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-20 17:30:40 -0700
committerSage Weil <sage@inktank.com>2012-07-30 18:16:02 -0700
commit43c7427d100769451601b8a36988ac0528ce0124 (patch)
treeb2105d55b3d88f37aa89df0d6a3730ebf85e4676 /net/ceph
parent4a8616920860920abaa51193146fe36b38ef09aa (diff)
downloadlinux-43c7427d100769451601b8a36988ac0528ce0124.tar.gz
linux-43c7427d100769451601b8a36988ac0528ce0124.tar.bz2
linux-43c7427d100769451601b8a36988ac0528ce0124.zip
libceph: clear all flags on con_close
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
-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 b872db5c4989..fa16f2cc35fe 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;