Skip to content

Commit

Permalink
ceph: messenger: check prepare_write_connect() result
Browse files Browse the repository at this point in the history
prepare_write_connect() can return an error, but only one of its
callers checks for it.  All the rest are in functions that already
return errors, so it should be fine to return the error if one
gets returned.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Alex Elder authored and Alex Elder committed May 17, 2012
1 parent e10c758 commit 5a0f8fd
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions 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 5a0f8fd

Please sign in to comment.