lkml.org 
[lkml]   [2012]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 077/171] ceph: use info returned by get_authorizer
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alex Elder <elder@inktank.com>

    (cherry picked from commit 8f43fb53894079bf0caab6e348ceaffe7adc651a)

    Rather than passing a bunch of arguments to be filled in with the
    content of the ceph_auth_handshake buffer now returned by the
    get_authorizer method, just use the returned information in the
    caller, and drop the unnecessary arguments.

    Signed-off-by: Alex Elder <elder@inktank.com>
    Reviewed-by: Sage Weil <sage@inktank.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/ceph/mds_client.c | 9 +--------
    include/linux/ceph/messenger.h | 4 +---
    net/ceph/messenger.c | 13 +++++++------
    net/ceph/osd_client.c | 9 +--------
    4 files changed, 10 insertions(+), 25 deletions(-)

    --- a/fs/ceph/mds_client.c
    +++ b/fs/ceph/mds_client.c
    @@ -3401,9 +3401,7 @@ out:
    * managed separately. Caller must *not* attempt to free it.
    */
    static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
    - void **buf, int *len, int *proto,
    - void **reply_buf, int *reply_len,
    - int force_new)
    + int *proto, int force_new)
    {
    struct ceph_mds_session *s = con->private;
    struct ceph_mds_client *mdsc = s->s_mdsc;
    @@ -3421,12 +3419,7 @@ static struct ceph_auth_handshake *get_a
    if (ret)
    return ERR_PTR(ret);
    }
    -
    *proto = ac->protocol;
    - *buf = auth->authorizer_buf;
    - *len = auth->authorizer_buf_len;
    - *reply_buf = auth->authorizer_reply_buf;
    - *reply_len = auth->authorizer_reply_buf_len;

    return auth;
    }
    --- a/include/linux/ceph/messenger.h
    +++ b/include/linux/ceph/messenger.h
    @@ -27,9 +27,7 @@ struct ceph_connection_operations {
    /* authorize an outgoing connection */
    struct ceph_auth_handshake *(*get_authorizer) (
    struct ceph_connection *con,
    - void **buf, int *len, int *proto,
    - void **reply_buf, int *reply_len,
    - int force_new);
    + int *proto, int force_new);
    int (*verify_authorizer_reply) (struct ceph_connection *con, int len);
    int (*invalidate_authorizer)(struct ceph_connection *con);

    --- a/net/ceph/messenger.c
    +++ b/net/ceph/messenger.c
    @@ -671,20 +671,21 @@ static int prepare_connect_authorizer(st

    mutex_unlock(&con->mutex);

    - auth_buf = NULL;
    - auth_len = 0;
    auth_protocol = CEPH_AUTH_UNKNOWN;
    - auth = con->ops->get_authorizer(con, &auth_buf, &auth_len,
    - &auth_protocol, &con->auth_reply_buf,
    - &con->auth_reply_buf_len, con->auth_retry);
    + auth = con->ops->get_authorizer(con, &auth_protocol, con->auth_retry);
    +
    mutex_lock(&con->mutex);

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

    + auth_buf = auth->authorizer_buf;
    + auth_len = auth->authorizer_buf_len;
    + con->auth_reply_buf = auth->authorizer_reply_buf;
    + con->auth_reply_buf_len = auth->authorizer_reply_buf_len;
    +
    con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol);
    con->out_connect.authorizer_len = cpu_to_le32(auth_len);

    --- a/net/ceph/osd_client.c
    +++ b/net/ceph/osd_client.c
    @@ -2113,9 +2113,7 @@ static void put_osd_con(struct ceph_conn
    * managed separately. Caller must *not* attempt to free it.
    */
    static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
    - void **buf, int *len, int *proto,
    - void **reply_buf, int *reply_len,
    - int force_new)
    + int *proto, int force_new)
    {
    struct ceph_osd *o = con->private;
    struct ceph_osd_client *osdc = o->o_osdc;
    @@ -2133,12 +2131,7 @@ static struct ceph_auth_handshake *get_a
    if (ret)
    return ERR_PTR(ret);
    }
    -
    *proto = ac->protocol;
    - *buf = auth->authorizer_buf;
    - *len = auth->authorizer_buf_len;
    - *reply_buf = auth->authorizer_reply_buf;
    - *reply_len = auth->authorizer_reply_buf_len;

    return auth;
    }



    \
     
     \ /
      Last update: 2012-11-23 12:01    [W:3.895 / U:1.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site