Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d9db87 authored by Jeff Layton's avatar Jeff Layton Committed by Linus Torvalds
Browse files

drivers/infiniband/hw/mlx4: convert to using idr_alloc_cyclic() 



Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Jack Morgenstein <jackm@dev.mellanox.co.il>
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Cc: Roland Dreier <roland@purestorage.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c027e446

drivers/infiniband/hw/mlx4/cm.c

+1 −3
Original line number Diff line number Diff line
@@ -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);