[PATCH 06/17] Update the infiniband uverbs driver to use idr helper functions.

[Lee Duncan]

Signed-off-by: Lee Duncan <ldun...@suse.com>
---
 drivers/infiniband/core/uverbs_cmd.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/infiniband/core/uverbs_cmd.c 
b/drivers/infiniband/core/uverbs_cmd.c
index bbb02ffe87df..1e5b2a66a501 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -120,24 +120,16 @@ static int idr_add_uobj(struct idr *idr, struct 
ib_uobject *uobj)
 {
        int ret;
 
-       idr_preload(GFP_KERNEL);
-       spin_lock(&ib_uverbs_idr_lock);
-
-       ret = idr_alloc(idr, uobj, 0, 0, GFP_NOWAIT);
+       ret = idr_get_index(idr, &ib_uverbs_idr_lock, uobj);
        if (ret >= 0)
                uobj->id = ret;
 
-       spin_unlock(&ib_uverbs_idr_lock);
-       idr_preload_end();
-
        return ret < 0 ? ret : 0;
 }
 
 void idr_remove_uobj(struct idr *idr, struct ib_uobject *uobj)
 {
-       spin_lock(&ib_uverbs_idr_lock);
-       idr_remove(idr, uobj->id);
-       spin_unlock(&ib_uverbs_idr_lock);
+       idr_put_index(idr, &ib_uverbs_idr_lock, uobj->id);
 }
 
 static struct ib_uobject *__idr_get_uobj(struct idr *idr, int id,
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/