Skip to content

Commit

Permalink
ceph: messenger: rework prepare_connect_authorizer()
Browse files Browse the repository at this point in the history
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: 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 5a0f8fd commit b1c6b98
Showing 1 changed file with 19 additions and 9 deletions.
28 changes: 19 additions & 9 deletions net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -656,19 +656,29 @@ static void prepare_write_keepalive(struct ceph_connection *con)
static int prepare_connect_authorizer(struct ceph_connection *con)
{
void *auth_buf;
int auth_len = 0;
int auth_protocol = 0;
int auth_len;
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);
if (con->ops->get_authorizer)
con->ops->get_authorizer(con, &auth_buf, &auth_len,
&auth_protocol, &con->auth_reply_buf,
&con->auth_reply_buf_len,
con->auth_retry);

auth_buf = NULL;
auth_len = 0;
auth_protocol = CEPH_AUTH_UNKNOWN;
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);

if (test_bit(CLOSED, &con->state) ||
test_bit(OPENING, &con->state))
if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))
return -EAGAIN;

con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol);
Expand Down

0 comments on commit b1c6b98

Please sign in to comment.