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[ 093/171] libceph: eliminate connection state "DEAD"
    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 e5e372da9a469dfe3ece40277090a7056c566838)

    The ceph connection state "DEAD" is never set and is therefore not
    needed. Eliminate it.

    Signed-off-by: Alex Elder <elder@inktank.com>
    Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/linux/ceph/messenger.h | 1 -
    net/ceph/messenger.c | 6 ------
    2 files changed, 7 deletions(-)

    --- a/include/linux/ceph/messenger.h
    +++ b/include/linux/ceph/messenger.h
    @@ -119,7 +119,6 @@ struct ceph_msg_pos {
    #define CLOSED 10 /* we've closed the connection */
    #define SOCK_CLOSED 11 /* socket state changed to closed */
    #define OPENING 13 /* open connection w/ (possibly new) peer */
    -#define DEAD 14 /* dead, about to kfree */
    #define BACKOFF 15

    /*
    --- a/net/ceph/messenger.c
    +++ b/net/ceph/messenger.c
    @@ -2091,12 +2091,6 @@ bad_tag:
    */
    static void queue_con(struct ceph_connection *con)
    {
    - if (test_bit(DEAD, &con->state)) {
    - dout("queue_con %p ignoring: DEAD\n",
    - con);
    - return;
    - }
    -
    if (!con->ops->get(con)) {
    dout("queue_con %p ref count 0\n", con);
    return;



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