aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/messenger.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 46fbc422ba7..3252ea974e8 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -336,7 +336,6 @@ static void reset_connection(struct ceph_connection *con)
336 ceph_msg_put(con->out_msg); 336 ceph_msg_put(con->out_msg);
337 con->out_msg = NULL; 337 con->out_msg = NULL;
338 } 338 }
339 con->out_keepalive_pending = false;
340 con->in_seq = 0; 339 con->in_seq = 0;
341 con->in_seq_acked = 0; 340 con->in_seq_acked = 0;
342} 341}
@@ -2019,10 +2018,10 @@ static void ceph_fault(struct ceph_connection *con)
2019 /* Requeue anything that hasn't been acked */ 2018 /* Requeue anything that hasn't been acked */
2020 list_splice_init(&con->out_sent, &con->out_queue); 2019 list_splice_init(&con->out_sent, &con->out_queue);
2021 2020
2022 /* If there are no messages in the queue, place the connection 2021 /* If there are no messages queued or keepalive pending, place
2023 * in a STANDBY state (i.e., don't try to reconnect just yet). */ 2022 * the connection in a STANDBY state */
2024 if (list_empty(&con->out_queue) && !con->out_keepalive_pending) { 2023 if (list_empty(&con->out_queue) &&
2025 dout("fault setting STANDBY\n"); 2024 !test_bit(KEEPALIVE_PENDING, &con->state)) {
2026 set_bit(STANDBY, &con->state); 2025 set_bit(STANDBY, &con->state);
2027 } else { 2026 } else {
2028 /* retry after a delay. */ 2027 /* retry after a delay. */