Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

authored by

Alex Elder and committed by
Alex Elder
b1c6b980 5a0f8fdd

+19 -9
+19 -9
net/ceph/messenger.c
··· 656 656 static int prepare_connect_authorizer(struct ceph_connection *con) 657 657 { 658 658 void *auth_buf; 659 - int auth_len = 0; 660 - int auth_protocol = 0; 659 + int auth_len; 660 + int auth_protocol; 661 + 662 + if (!con->ops->get_authorizer) { 663 + con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN; 664 + con->out_connect.authorizer_len = 0; 665 + 666 + return 0; 667 + } 668 + 669 + /* Can't hold the mutex while getting authorizer */ 661 670 662 671 mutex_unlock(&con->mutex); 663 - if (con->ops->get_authorizer) 664 - con->ops->get_authorizer(con, &auth_buf, &auth_len, 665 - &auth_protocol, &con->auth_reply_buf, 666 - &con->auth_reply_buf_len, 667 - con->auth_retry); 672 + 673 + auth_buf = NULL; 674 + auth_len = 0; 675 + auth_protocol = CEPH_AUTH_UNKNOWN; 676 + con->ops->get_authorizer(con, &auth_buf, &auth_len, &auth_protocol, 677 + &con->auth_reply_buf, &con->auth_reply_buf_len, 678 + con->auth_retry); 668 679 mutex_lock(&con->mutex); 669 680 670 - if (test_bit(CLOSED, &con->state) || 671 - test_bit(OPENING, &con->state)) 681 + if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state)) 672 682 return -EAGAIN; 673 683 674 684 con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol);