Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309461
b: refs/heads/master
c: 84fb3ad
h: refs/heads/master
i:
  309459: 21e8109
v: v3
  • Loading branch information
Alex Elder authored and Alex Elder committed May 17, 2012
1 parent ec2c467 commit cfbf485
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d329156f16306449c273002486c28de3ddddfd89
refs/heads/master: 84fb3adf6413862cff51d8af3fce5f0b655586a2
6 changes: 5 additions & 1 deletion trunk/net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,6 @@ static int prepare_write_connect(struct ceph_messenger *msgr,
con->out_connect.protocol_version = cpu_to_le32(proto);
con->out_connect.flags = 0;

ceph_con_out_kvec_reset(con);
if (include_banner)
prepare_write_banner(msgr, con);
ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect);
Expand Down Expand Up @@ -1389,6 +1388,7 @@ static int process_connect(struct ceph_connection *con)
return -1;
}
con->auth_retry = 1;
ceph_con_out_kvec_reset(con);
ret = prepare_write_connect(con->msgr, con, 0);
if (ret < 0)
return ret;
Expand All @@ -1409,6 +1409,7 @@ static int process_connect(struct ceph_connection *con)
ENTITY_NAME(con->peer_name),
ceph_pr_addr(&con->peer_addr.in_addr));
reset_connection(con);
ceph_con_out_kvec_reset(con);
prepare_write_connect(con->msgr, con, 0);
prepare_read_connect(con);

Expand All @@ -1432,6 +1433,7 @@ static int process_connect(struct ceph_connection *con)
le32_to_cpu(con->out_connect.connect_seq),
le32_to_cpu(con->in_connect.connect_seq));
con->connect_seq = le32_to_cpu(con->in_connect.connect_seq);
ceph_con_out_kvec_reset(con);
prepare_write_connect(con->msgr, con, 0);
prepare_read_connect(con);
break;
Expand All @@ -1446,6 +1448,7 @@ static int process_connect(struct ceph_connection *con)
le32_to_cpu(con->in_connect.global_seq));
get_global_seq(con->msgr,
le32_to_cpu(con->in_connect.global_seq));
ceph_con_out_kvec_reset(con);
prepare_write_connect(con->msgr, con, 0);
prepare_read_connect(con);
break;
Expand Down Expand Up @@ -1851,6 +1854,7 @@ static int try_write(struct ceph_connection *con)

/* open the socket first? */
if (con->sock == NULL) {
ceph_con_out_kvec_reset(con);
prepare_write_connect(msgr, con, 1);
prepare_read_banner(con);
set_bit(CONNECTING, &con->state);
Expand Down

0 comments on commit cfbf485

Please sign in to comment.