lkml.org 
[lkml]   [2013]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 60/62] sctp: convert to idr_alloc()
    Date
    Convert to the much saner new idr interface.

    Only compile tested.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Vlad Yasevich <vyasevich@gmail.com>
    Cc: Sridhar Samudrala <sri@us.ibm.com>
    Cc: Neil Horman <nhorman@tuxdriver.com>
    Cc: linux-sctp@vger.kernel.org
    ---
    This patch depends on an earlier idr changes and I think it would be
    best to route these together through -mm. Please holler if there's
    any objection. Thanks.

    net/sctp/associola.c | 27 +++++++++++----------------
    1 file changed, 11 insertions(+), 16 deletions(-)

    diff --git a/net/sctp/associola.c b/net/sctp/associola.c
    index b45ed1f..a9962e4 100644
    --- a/net/sctp/associola.c
    +++ b/net/sctp/associola.c
    @@ -1592,32 +1592,27 @@ int sctp_assoc_lookup_laddr(struct sctp_association *asoc,
    /* Set an association id for a given association */
    int sctp_assoc_set_id(struct sctp_association *asoc, gfp_t gfp)
    {
    - int assoc_id;
    - int error = 0;
    + int ret;

    /* If the id is already assigned, keep it. */
    if (asoc->assoc_id)
    - return error;
    -retry:
    - if (unlikely(!idr_pre_get(&sctp_assocs_id, gfp)))
    - return -ENOMEM;
    + return 0;

    + idr_preload(gfp);
    spin_lock_bh(&sctp_assocs_id_lock);
    - error = idr_get_new_above(&sctp_assocs_id, (void *)asoc,
    - idr_low, &assoc_id);
    - if (!error) {
    - idr_low = assoc_id + 1;
    + ret = idr_alloc(&sctp_assocs_id, asoc, idr_low, 0, GFP_NOWAIT);
    + if (ret >= 0) {
    + idr_low = ret + 1;
    if (idr_low == INT_MAX)
    idr_low = 1;
    }
    spin_unlock_bh(&sctp_assocs_id_lock);
    - if (error == -EAGAIN)
    - goto retry;
    - else if (error)
    - return error;
    + idr_preload_end();
    + if (ret < 0)
    + return ret;

    - asoc->assoc_id = (sctp_assoc_t) assoc_id;
    - return error;
    + asoc->assoc_id = (sctp_assoc_t)ret;
    + return 0;
    }

    /* Free the ASCONF queue */
    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-03 03:21    [W:2.816 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site