Commit 5a0f8fdd authored by Alex Elder's avatar Alex Elder Committed by Alex Elder

ceph: messenger: check prepare_write_connect() result

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: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent e10c758e
...@@ -1409,7 +1409,9 @@ static int process_connect(struct ceph_connection *con) ...@@ -1409,7 +1409,9 @@ static int process_connect(struct ceph_connection *con)
ceph_pr_addr(&con->peer_addr.in_addr)); ceph_pr_addr(&con->peer_addr.in_addr));
reset_connection(con); reset_connection(con);
ceph_con_out_kvec_reset(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); prepare_read_connect(con);
/* Tell ceph about it. */ /* Tell ceph about it. */
...@@ -1433,7 +1435,9 @@ static int process_connect(struct ceph_connection *con) ...@@ -1433,7 +1435,9 @@ static int process_connect(struct ceph_connection *con)
le32_to_cpu(con->in_connect.connect_seq)); le32_to_cpu(con->in_connect.connect_seq));
con->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); ceph_con_out_kvec_reset(con);
prepare_write_connect(con); ret = prepare_write_connect(con);
if (ret < 0)
return ret;
prepare_read_connect(con); prepare_read_connect(con);
break; break;
...@@ -1448,7 +1452,9 @@ static int process_connect(struct ceph_connection *con) ...@@ -1448,7 +1452,9 @@ static int process_connect(struct ceph_connection *con)
get_global_seq(con->msgr, get_global_seq(con->msgr,
le32_to_cpu(con->in_connect.global_seq)); le32_to_cpu(con->in_connect.global_seq));
ceph_con_out_kvec_reset(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); prepare_read_connect(con);
break; break;
...@@ -1854,7 +1860,9 @@ static int try_write(struct ceph_connection *con) ...@@ -1854,7 +1860,9 @@ static int try_write(struct ceph_connection *con)
if (con->sock == NULL) { if (con->sock == NULL) {
ceph_con_out_kvec_reset(con); ceph_con_out_kvec_reset(con);
prepare_write_banner(con); prepare_write_banner(con);
prepare_write_connect(con); ret = prepare_write_connect(con);
if (ret < 0)
goto out;
prepare_read_banner(con); prepare_read_banner(con);
set_bit(CONNECTING, &con->state); set_bit(CONNECTING, &con->state);
clear_bit(NEGOTIATING, &con->state); clear_bit(NEGOTIATING, &con->state);
......
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