From acba97fe627bfd3ca2a931c41357c37cd4f356a1 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 16 May 2012 15:16:38 -0500 Subject: [PATCH] --- yaml --- r: 309467 b: refs/heads/master c: ed96af646011412c2bf1ffe860db170db355fae5 h: refs/heads/master i: 309465: 2807210d895a7870be9581a21e9512623b8e05f2 309463: 8617471a566313f718e2a48324fd487eeee613eb v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5d7d513cb7cb..5d01d95b63d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1c6b9803f5491e94041e6da96bc9dec3870e792 +refs/heads/master: ed96af646011412c2bf1ffe860db170db355fae5 diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index 09409a3d9500..e0532d5b22f5 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -658,6 +658,7 @@ static int prepare_connect_authorizer(struct ceph_connection *con) void *auth_buf; int auth_len; int auth_protocol; + int ret; if (!con->ops->get_authorizer) { con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN; @@ -673,11 +674,14 @@ static int prepare_connect_authorizer(struct ceph_connection *con) 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); + ret = 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 (ret) + return ret; + if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state)) return -EAGAIN;