ceph: messenger: rework prepare_connect_authorizer()

(cherry picked from commit b1c6b9803f5491e94041e6da96bc9dec3870e792)

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 8e76936a8c134b7731d61cfedde692d1cfac242c..09409a3d95000984860f5738da4c6e0d83f3f971 100644 (file)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -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);