projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
63c1362
)
libceph: clear all flags on con_close
author
Sage Weil
<sage@inktank.com>
Sat, 21 Jul 2012 00:30:40 +0000
(17:30 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 26 Nov 2012 19:38:41 +0000
(11:38 -0800)
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit
43c7427d100769451601b8a36988ac0528ce0124
)
net/ceph/messenger.c
patch
|
blob
|
history
diff --git
a/net/ceph/messenger.c
b/net/ceph/messenger.c
index
ca703f1
..
e97bb59
100644
(file)
--- 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;