diff options
author | Sage Weil <sage@inktank.com> | 2012-12-27 20:27:04 -0600 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2012-12-27 20:27:04 -0600 |
commit | 0fa6ebc600bc8e830551aee47a0e929e818a1868 (patch) | |
tree | e9768481dfd72099c1615a357c4e2f489d596d68 | |
parent | 122070a2ffc91f87fe8e8493eb0ac61986c5557c (diff) | |
download | linux-stable-0fa6ebc600bc8e830551aee47a0e929e818a1868.tar.gz linux-stable-0fa6ebc600bc8e830551aee47a0e929e818a1868.tar.bz2 linux-stable-0fa6ebc600bc8e830551aee47a0e929e818a1868.zip |
libceph: fix protocol feature mismatch failure path
We should not set con->state to CLOSED here; that happens in
ceph_fault() in the caller, where it first asserts that the state
is not yet CLOSED. Avoids a BUG when the features don't match.
Since the fail_protocol() has become a trivial wrapper, replace
calls to it with direct calls to reset_connection().
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
-rw-r--r-- | net/ceph/messenger.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 3b386674e34c..5ccf87ed8d68 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -506,6 +506,7 @@ static void reset_connection(struct ceph_connection *con) { /* reset connection, out_queue, msg_ and connect_seq */ /* discard existing out_queue and msg_seq */ + dout("reset_connection %p\n", con); ceph_msg_remove_list(&con->out_queue); ceph_msg_remove_list(&con->out_sent); @@ -1506,13 +1507,6 @@ static int process_banner(struct ceph_connection *con) return 0; } -static void fail_protocol(struct ceph_connection *con) -{ - reset_connection(con); - WARN_ON(con->state != CON_STATE_NEGOTIATING); - con->state = CON_STATE_CLOSED; -} - static int process_connect(struct ceph_connection *con) { u64 sup_feat = con->msgr->supported_features; @@ -1530,7 +1524,7 @@ static int process_connect(struct ceph_connection *con) ceph_pr_addr(&con->peer_addr.in_addr), sup_feat, server_feat, server_feat & ~sup_feat); con->error_msg = "missing required protocol features"; - fail_protocol(con); + reset_connection(con); return -1; case CEPH_MSGR_TAG_BADPROTOVER: @@ -1541,7 +1535,7 @@ static int process_connect(struct ceph_connection *con) le32_to_cpu(con->out_connect.protocol_version), le32_to_cpu(con->in_reply.protocol_version)); con->error_msg = "protocol version mismatch"; - fail_protocol(con); + reset_connection(con); return -1; case CEPH_MSGR_TAG_BADAUTHORIZER: @@ -1631,7 +1625,7 @@ static int process_connect(struct ceph_connection *con) ceph_pr_addr(&con->peer_addr.in_addr), req_feat, server_feat, req_feat & ~server_feat); con->error_msg = "missing required protocol features"; - fail_protocol(con); + reset_connection(con); return -1; } |