]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
libceph: clear all flags on con_close
authorSage Weil <sage@inktank.com>
Sat, 21 Jul 2012 00:30:40 +0000 (17:30 -0700)
committerGreg 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

index ca703f131e95f3066cc1c3299aabdbc531dc3ff6..e97bb59db1ac02f69d3b8a23aa00aaeebdf7a7c4 100644 (file)
@@ -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;