aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/messenger.c2
-rw-r--r--fs/ceph/messenger.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c
index 395ce326beda..8cfca375c6a9 100644
--- a/fs/ceph/messenger.c
+++ b/fs/ceph/messenger.c
@@ -340,6 +340,7 @@ static void reset_connection(struct ceph_connection *con)
340 ceph_msg_put(con->out_msg); 340 ceph_msg_put(con->out_msg);
341 con->out_msg = NULL; 341 con->out_msg = NULL;
342 } 342 }
343 con->out_keepalive_pending = false;
343 con->in_seq = 0; 344 con->in_seq = 0;
344 con->in_seq_acked = 0; 345 con->in_seq_acked = 0;
345} 346}
@@ -357,6 +358,7 @@ void ceph_con_close(struct ceph_connection *con)
357 clear_bit(WRITE_PENDING, &con->state); 358 clear_bit(WRITE_PENDING, &con->state);
358 mutex_lock(&con->mutex); 359 mutex_lock(&con->mutex);
359 reset_connection(con); 360 reset_connection(con);
361 con->peer_global_seq = 0;
360 cancel_delayed_work(&con->work); 362 cancel_delayed_work(&con->work);
361 mutex_unlock(&con->mutex); 363 mutex_unlock(&con->mutex);
362 queue_con(con); 364 queue_con(con);
diff --git a/fs/ceph/messenger.h b/fs/ceph/messenger.h
index 27fb69585f63..e56564f7e71c 100644
--- a/fs/ceph/messenger.h
+++ b/fs/ceph/messenger.h
@@ -158,7 +158,6 @@ struct ceph_connection {
158 struct list_head out_queue; 158 struct list_head out_queue;
159 struct list_head out_sent; /* sending or sent but unacked */ 159 struct list_head out_sent; /* sending or sent but unacked */
160 u64 out_seq; /* last message queued for send */ 160 u64 out_seq; /* last message queued for send */
161 u64 out_seq_sent; /* last message sent */
162 bool out_keepalive_pending; 161 bool out_keepalive_pending;
163 162
164 u64 in_seq, in_seq_acked; /* last message received, acked */ 163 u64 in_seq, in_seq_acked; /* last message received, acked */