[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1364412578-7462-4-git-send-email-jlayton@redhat.com>
Date: Wed, 27 Mar 2013 15:29:35 -0400
From: Jeff Layton <jlayton@...hat.com>
To: akpm@...ux-foundation.org
Cc: linux-kernel@...r.kernel.org, tj@...nel.org,
Jack Morgenstein <jackm@....mellanox.co.il>,
Or Gerlitz <ogerlitz@...lanox.com>,
Roland Dreier <roland@...estorage.com>,
linux-rdma@...r.kernel.org
Subject: [PATCH v2 3/6] mlx4: convert to using idr_alloc_cyclic
(Note: compile tested only)
Signed-off-by: Jeff Layton <jlayton@...hat.com>
Cc: Tejun Heo <tj@...nel.org>
Cc: Jack Morgenstein <jackm@....mellanox.co.il>
Cc: Or Gerlitz <ogerlitz@...lanox.com>
Cc: Roland Dreier <roland@...estorage.com>
Cc: linux-rdma@...r.kernel.org
---
drivers/infiniband/hw/mlx4/cm.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index add98d0..d1f5f1d 100644
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -204,7 +204,6 @@ static struct id_map_entry *
id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
{
int ret;
- static int next_id;
struct id_map_entry *ent;
struct mlx4_ib_sriov *sriov = &to_mdev(ibdev)->sriov;
@@ -223,9 +222,8 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
idr_preload(GFP_KERNEL);
spin_lock(&to_mdev(ibdev)->sriov.id_map_lock);
- ret = idr_alloc(&sriov->pv_id_table, ent, next_id, 0, GFP_NOWAIT);
+ ret = idr_alloc_cyclic(&sriov->pv_id_table, ent, 0, 0, GFP_NOWAIT);
if (ret >= 0) {
- next_id = max(ret + 1, 0);
ent->pv_cm_id = (u32)ret;
sl_id_map_add(ibdev, ent);
list_add_tail(&ent->list, &sriov->cm_list);
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists