提交 b1c6b980 编写于 作者: A Alex Elder 提交者: Alex Elder

ceph: messenger: rework prepare_connect_authorizer()

Change prepare_connect_authorizer() so it returns without dropping
the connection mutex if the connection has no get_authorizer method.

Use the symbolic CEPH_AUTH_UNKNOWN instead of 0 when assigning
authorization protocols.
Signed-off-by: NAlex Elder <elder@inktank.com>
Reviewed-by: NSage Weil <sage@inktank.com>
上级 5a0f8fdd
...@@ -656,19 +656,29 @@ static void prepare_write_keepalive(struct ceph_connection *con) ...@@ -656,19 +656,29 @@ static void prepare_write_keepalive(struct ceph_connection *con)
static int prepare_connect_authorizer(struct ceph_connection *con) static int prepare_connect_authorizer(struct ceph_connection *con)
{ {
void *auth_buf; void *auth_buf;
int auth_len = 0; int auth_len;
int auth_protocol = 0; int auth_protocol;
if (!con->ops->get_authorizer) {
con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN;
con->out_connect.authorizer_len = 0;
return 0;
}
/* Can't hold the mutex while getting authorizer */
mutex_unlock(&con->mutex); mutex_unlock(&con->mutex);
if (con->ops->get_authorizer)
con->ops->get_authorizer(con, &auth_buf, &auth_len, auth_buf = NULL;
&auth_protocol, &con->auth_reply_buf, auth_len = 0;
&con->auth_reply_buf_len, auth_protocol = CEPH_AUTH_UNKNOWN;
con->auth_retry); con->ops->get_authorizer(con, &auth_buf, &auth_len, &auth_protocol,
&con->auth_reply_buf, &con->auth_reply_buf_len,
con->auth_retry);
mutex_lock(&con->mutex); mutex_lock(&con->mutex);
if (test_bit(CLOSED, &con->state) || if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))
test_bit(OPENING, &con->state))
return -EAGAIN; return -EAGAIN;
con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol); con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册