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[ 117/171] libceph: drop ceph_con_get/put helpers and nref member
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Sage Weil <sage@inktank.com>

    (cherry picked from commit d59315ca8c0de00df9b363f94a2641a30961ca1c)

    These are no longer used. Every ceph_connection instance is embedded in
    another structure, and refcounts manipulated via the get/put ops.

    Signed-off-by: Sage Weil <sage@inktank.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/linux/ceph/messenger.h | 1 -
    net/ceph/messenger.c | 28 +---------------------------
    2 files changed, 1 insertion(+), 28 deletions(-)

    --- a/include/linux/ceph/messenger.h
    +++ b/include/linux/ceph/messenger.h
    @@ -135,7 +135,6 @@ struct ceph_msg_pos {
    */
    struct ceph_connection {
    void *private;
    - atomic_t nref;

    const struct ceph_connection_operations *ops;

    --- a/net/ceph/messenger.c
    +++ b/net/ceph/messenger.c
    @@ -501,30 +501,6 @@ bool ceph_con_opened(struct ceph_connect
    }

    /*
    - * generic get/put
    - */
    -struct ceph_connection *ceph_con_get(struct ceph_connection *con)
    -{
    - int nref = __atomic_add_unless(&con->nref, 1, 0);
    -
    - dout("con_get %p nref = %d -> %d\n", con, nref, nref + 1);
    -
    - return nref ? con : NULL;
    -}
    -
    -void ceph_con_put(struct ceph_connection *con)
    -{
    - int nref = atomic_dec_return(&con->nref);
    -
    - BUG_ON(nref < 0);
    - if (nref == 0) {
    - BUG_ON(con->sock);
    - kfree(con);
    - }
    - dout("con_put %p nref = %d -> %d\n", con, nref + 1, nref);
    -}
    -
    -/*
    * initialize a new connection.
    */
    void ceph_con_init(struct ceph_connection *con, void *private,
    @@ -535,7 +511,6 @@ void ceph_con_init(struct ceph_connectio
    memset(con, 0, sizeof(*con));
    con->private = private;
    con->ops = ops;
    - atomic_set(&con->nref, 1);
    con->msgr = msgr;

    con_sock_state_init(con);
    @@ -1951,8 +1926,7 @@ static int try_write(struct ceph_connect
    {
    int ret = 1;

    - dout("try_write start %p state %lu nref %d\n", con, con->state,
    - atomic_read(&con->nref));
    + dout("try_write start %p state %lu\n", con, con->state);

    more:
    dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes);



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