From 5b622472949554013ef7699ec5d4a55c67bfcb50 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Mon, 21 May 2007 19:06:54 +0300 Subject: [PATCH] --- yaml --- r: 56749 b: refs/heads/master c: 9f81036c54ed1f860d2807c5a6aa4f2b30c21204 h: refs/heads/master i: 56747: 16fa9542a3097d8a9faea9de6ce1945468c1476c v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/cm.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca75ecbc49b2..dc1ea8ec33d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 518b1646f8a31904ca637b8df0c1e31c34a7a3c2 +refs/heads/master: 9f81036c54ed1f860d2807c5a6aa4f2b30c21204 diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c index eff591deeb46..e840434a96d8 100644 --- a/trunk/drivers/infiniband/core/cm.c +++ b/trunk/drivers/infiniband/core/cm.c @@ -306,7 +306,9 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv) do { spin_lock_irqsave(&cm.lock, flags); ret = idr_get_new_above(&cm.local_id_table, cm_id_priv, - next_id++, &id); + next_id, &id); + if (!ret) + next_id = ((unsigned) id + 1) & MAX_ID_MASK; spin_unlock_irqrestore(&cm.lock, flags); } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );