diff options
author | Sage Weil <sage@newdream.net> | 2010-04-02 19:16:34 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-05-17 18:25:20 -0400 |
commit | 6f2bc3ff4cdb03903c79e155e9e1889ce176de09 (patch) | |
tree | 73f3db68650997b714073c9f04eef40dcd2b6d96 /fs/ceph/messenger.c | |
parent | bb257664f748bcfc80715f85f70f0f560caec3b4 (diff) |
ceph: clean up connection reset
Reset out_keepalive_pending and peer_global_seq, and drop unused var.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/messenger.c')
-rw-r--r-- | fs/ceph/messenger.c | 2 |
1 files changed, 2 insertions, 0 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); |