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 39/77] IB/amso1100: 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: Tom Tucker <tom@opengridcomputing.com>
    Cc: linux-rdma@vger.kernel.org
    ---
    drivers/infiniband/hw/amso1100/c2_qp.c | 19 +++++++++++--------
    1 file changed, 11 insertions(+), 8 deletions(-)

    diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
    index 28cd5cb..0ab826b 100644
    --- a/drivers/infiniband/hw/amso1100/c2_qp.c
    +++ b/drivers/infiniband/hw/amso1100/c2_qp.c
    @@ -382,14 +382,17 @@ static int c2_alloc_qpn(struct c2_dev *c2dev, struct c2_qp *qp)
    {
    int ret;

    - do {
    - spin_lock_irq(&c2dev->qp_table.lock);
    - ret = idr_get_new_above(&c2dev->qp_table.idr, qp,
    - c2dev->qp_table.last++, &qp->qpn);
    - spin_unlock_irq(&c2dev->qp_table.lock);
    - } while ((ret == -EAGAIN) &&
    - idr_pre_get(&c2dev->qp_table.idr, GFP_KERNEL));
    - return ret;
    + idr_preload(GFP_KERNEL);
    + spin_lock_irq(&c2dev->qp_table.lock);
    +
    + ret = idr_alloc(&c2dev->qp_table.idr, qp, c2dev->qp_table.last++, 0,
    + GFP_NOWAIT);
    + if (ret >= 0)
    + qp->qpn = ret;
    +
    + spin_unlock_irq(&c2dev->qp_table.lock);
    + idr_preload_end();
    + return ret < 0 ? ret : 0;
    }

    static void c2_free_qpn(struct c2_dev *c2dev, int qpn)
    --
    1.8.1


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