Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309465
b: refs/heads/master
c: 5a0f8fd
h: refs/heads/master
i:
  309463: 8617471
v: v3
  • Loading branch information
Alex Elder authored and Alex Elder committed May 17, 2012
1 parent 8795241 commit 2807210
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 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: e10c758e4031a801ea4d2f8fb39bf14c2658d74b
refs/heads/master: 5a0f8fdd8a0ebe320952a388331dc043d7e14ced
16 changes: 12 additions & 4 deletions trunk/net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,9 @@ static int process_connect(struct ceph_connection *con)
ceph_pr_addr(&con->peer_addr.in_addr));
reset_connection(con);
ceph_con_out_kvec_reset(con);
prepare_write_connect(con);
ret = prepare_write_connect(con);
if (ret < 0)
return ret;
prepare_read_connect(con);

/* Tell ceph about it. */
Expand All @@ -1433,7 +1435,9 @@ static int process_connect(struct ceph_connection *con)
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);
ret = prepare_write_connect(con);
if (ret < 0)
return ret;
prepare_read_connect(con);
break;

Expand All @@ -1448,7 +1452,9 @@ static int process_connect(struct ceph_connection *con)
get_global_seq(con->msgr,
le32_to_cpu(con->in_connect.global_seq));
ceph_con_out_kvec_reset(con);
prepare_write_connect(con);
ret = prepare_write_connect(con);
if (ret < 0)
return ret;
prepare_read_connect(con);
break;

Expand Down Expand Up @@ -1854,7 +1860,9 @@ static int try_write(struct ceph_connection *con)
if (con->sock == NULL) {
ceph_con_out_kvec_reset(con);
prepare_write_banner(con);
prepare_write_connect(con);
ret = prepare_write_connect(con);
if (ret < 0)
goto out;
prepare_read_banner(con);
set_bit(CONNECTING, &con->state);
clear_bit(NEGOTIATING, &con->state);
Expand Down

0 comments on commit 2807210

Please sign in to comment.