Commit 684be25c authored by Sage Weil's avatar Sage Weil

ceph: fix seq counting for skipped messages

Increment in_seq even when the message is skipped for some reason.
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent d45d0d97
...@@ -1379,6 +1379,7 @@ static int read_partial_message(struct ceph_connection *con) ...@@ -1379,6 +1379,7 @@ static int read_partial_message(struct ceph_connection *con)
con->in_base_pos = -front_len - middle_len - data_len - con->in_base_pos = -front_len - middle_len - data_len -
sizeof(m->footer); sizeof(m->footer);
con->in_tag = CEPH_MSGR_TAG_READY; con->in_tag = CEPH_MSGR_TAG_READY;
con->in_seq++;
return 0; return 0;
} }
if (IS_ERR(con->in_msg)) { if (IS_ERR(con->in_msg)) {
...@@ -2030,6 +2031,7 @@ void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg) ...@@ -2030,6 +2031,7 @@ void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg)
ceph_msg_put(con->in_msg); ceph_msg_put(con->in_msg);
con->in_msg = NULL; con->in_msg = NULL;
con->in_tag = CEPH_MSGR_TAG_READY; con->in_tag = CEPH_MSGR_TAG_READY;
con->in_seq++;
} else { } else {
dout("con_revoke_pages %p msg %p pages %p no-op\n", dout("con_revoke_pages %p msg %p pages %p no-op\n",
con, con->in_msg, msg); con, con->in_msg, msg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment