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

Commit ab626d1a authored by Zhao Hongjiang's avatar Zhao Hongjiang Committed by Roland Dreier
Browse files

IB/cm: Convert to using idr_alloc_cyclic() 



Commit 3e6628c4 ("idr: introduce idr_alloc_cyclic()") adds a new
idr_alloc_cyclic() routine and converts several of these users to it.
This is just a missed one - add it.

Signed-off-by: default avatarZhao Hongjiang <zhaohongjiang@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 1c636f80

drivers/infiniband/core/cm.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -383,14 +383,11 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv) 
{

{

	unsigned long flags;

	unsigned long flags;

	int id;

	int id;

	static int next_id;





	idr_preload(GFP_KERNEL);

	idr_preload(GFP_KERNEL);

	spin_lock_irqsave(&cm.lock, flags);

	spin_lock_irqsave(&cm.lock, flags);





	id = idr_alloc(&cm.local_id_table, cm_id_priv, next_id, 0, GFP_NOWAIT);

	id = idr_alloc_cyclic(&cm.local_id_table, cm_id_priv, 0, 0, GFP_NOWAIT);

	if (id >= 0)

		next_id = max(id + 1, 0);





	spin_unlock_irqrestore(&cm.lock, flags);

	spin_unlock_irqrestore(&cm.lock, flags);

	idr_preload_end();

	idr_preload_end();