From 6b818abab95a6dbd6b4425116454bd71bb543b9a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 2 Apr 2010 16:16:34 -0700 Subject: [PATCH] --- yaml --- r: 198054 b: refs/heads/master c: 6f2bc3ff4cdb03903c79e155e9e1889ce176de09 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/messenger.c | 2 ++ trunk/fs/ceph/messenger.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 47a24e25fd1b..759e0c8dc568 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb257664f748bcfc80715f85f70f0f560caec3b4 +refs/heads/master: 6f2bc3ff4cdb03903c79e155e9e1889ce176de09 diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c index 395ce326beda..8cfca375c6a9 100644 --- a/trunk/fs/ceph/messenger.c +++ b/trunk/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/trunk/fs/ceph/messenger.h b/trunk/fs/ceph/messenger.h index 27fb69585f63..e56564f7e71c 100644 --- a/trunk/fs/ceph/messenger.h +++ b/trunk/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 */