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

    Only compile tested.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reviewed-by: Steve Wise <swise@opengridcomputing.com>
    Cc: linux-rdma@vger.kernel.org
    ---
    drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 27 ++++++++++++++-------------
    1 file changed, 14 insertions(+), 13 deletions(-)

    diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
    index 9c1644f..7f862da 100644
    --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
    +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
    @@ -260,20 +260,21 @@ static inline int _insert_handle(struct c4iw_dev *rhp, struct idr *idr,
    void *handle, u32 id, int lock)
    {
    int ret;
    - int newid;

    - do {
    - if (!idr_pre_get(idr, lock ? GFP_KERNEL : GFP_ATOMIC))
    - return -ENOMEM;
    - if (lock)
    - spin_lock_irq(&rhp->lock);
    - ret = idr_get_new_above(idr, handle, id, &newid);
    - BUG_ON(!ret && newid != id);
    - if (lock)
    - spin_unlock_irq(&rhp->lock);
    - } while (ret == -EAGAIN);
    -
    - return ret;
    + if (lock) {
    + idr_preload(GFP_KERNEL);
    + spin_lock_irq(&rhp->lock);
    + }
    +
    + ret = idr_alloc(idr, handle, id, id + 1, GFP_ATOMIC);
    +
    + if (lock) {
    + spin_unlock_irq(&rhp->lock);
    + idr_preload_end();
    + }
    +
    + BUG_ON(ret == -ENOSPC);
    + return ret < 0 ? ret : 0;
    }

    static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr,
    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-06 23:44    [W:3.684 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site