diff options
| author | Alex Elder | 2012-05-17 04:51:59 +0200 |
|---|---|---|
| committer | Alex Elder | 2012-05-17 15:18:12 +0200 |
| commit | 5a0f8fdd8a0ebe320952a388331dc043d7e14ced (patch) | |
| tree | 64218dc46ca530cdd363f58d7a20e9c8dad23375 /net/ceph/messenger.c | |
| parent | ceph: don't set WRITE_PENDING too early (diff) | |
| download | kernel-qcow2-linux-5a0f8fdd8a0ebe320952a388331dc043d7e14ced.tar.gz kernel-qcow2-linux-5a0f8fdd8a0ebe320952a388331dc043d7e14ced.tar.xz kernel-qcow2-linux-5a0f8fdd8a0ebe320952a388331dc043d7e14ced.zip | |
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: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph/messenger.c')
| -rw-r--r-- | net/ceph/messenger.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index cf292939dd1e..8e76936a8c13 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -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. */ @@ -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; @@ -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; @@ -1854,7 +1860,9 @@ more: 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); |