From: Sage Weil <sage@inktank.com>
Date: Sat, 21 Jul 2012 00:30:40 +0000 (-0700)
Subject: libceph: clear all flags on con_close
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=43c7427d100769451601b8a36988ac0528ce0124;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

libceph: clear all flags on con_close

Signed-off-by: Sage Weil <sage@inktank.com>
---

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;