diff options
| author | Sage Weil <sage@newdream.net> | 2010-04-02 16:16:34 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-05-17 15:25:20 -0700 |
| commit | 6f2bc3ff4cdb03903c79e155e9e1889ce176de09 (patch) | |
| tree | 73f3db68650997b714073c9f04eef40dcd2b6d96 | |
| parent | bb257664f748bcfc80715f85f70f0f560caec3b4 (diff) | |
| download | linux-rt-6f2bc3ff4cdb03903c79e155e9e1889ce176de09.tar.gz | |
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>
| -rw-r--r-- | fs/ceph/messenger.c | 2 | ||||
| -rw-r--r-- | fs/ceph/messenger.h | 1 |
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) ceph_msg_put(con->out_msg); con->out_msg = NULL; } + con->out_keepalive_pending = false; con->in_seq = 0; con->in_seq_acked = 0; } @@ -357,6 +358,7 @@ void ceph_con_close(struct ceph_connection *con) clear_bit(WRITE_PENDING, &con->state); mutex_lock(&con->mutex); reset_connection(con); + con->peer_global_seq = 0; cancel_delayed_work(&con->work); mutex_unlock(&con->mutex); 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 { struct list_head out_queue; struct list_head out_sent; /* sending or sent but unacked */ u64 out_seq; /* last message queued for send */ - u64 out_seq_sent; /* last message sent */ bool out_keepalive_pending; u64 in_seq, in_seq_acked; /* last message received, acked */ |