From patchwork Wed Feb 6 19:40:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 2107231 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id C934A3FCFC for ; Wed, 6 Feb 2013 20:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758221Ab3BFTuh (ORCPT ); Wed, 6 Feb 2013 14:50:37 -0500 Received: from mail-oa0-f52.google.com ([209.85.219.52]:40277 "EHLO mail-oa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758207Ab3BFTuc (ORCPT ); Wed, 6 Feb 2013 14:50:32 -0500 Received: by mail-oa0-f52.google.com with SMTP id k14so1972114oag.11 for ; Wed, 06 Feb 2013 11:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=NQPSz3mVNHYhRZCbO7sVu7rDkS1a/2tq4/MCGaYgB0g=; b=Z5fevBM7kNxWnaNmjl+qrBFFsmAiOt1YnHlf+MpqXHDgsbNQsA5bJDNTVYtglCArAQ iZeFuhPB/7E2u+hwGj6vS91Bp54KvhrWaRIiwjYd+su5dCWGkwOzyhk0i8Opg4hjFeQt eFSZVZxak3JT9fzKW/mBInsgCPYRqu/lNLKLdQQdjKOpZDs72RswWNjOlEANbRq9OAAX 7/gmKO5baA40sHc0BYUy+IHVrWJLeYZs91GPkp7z8La7N+8Sc/limwiWEFXkuH641RMo +ascO8GqYryxsr0QmwSXKK4hzGzxwubyf+KHw5QqmJ2l1U/s7nPbaTZNi1CitctLYZMr zrcg== X-Received: by 10.182.40.2 with SMTP id t2mr22277005obk.51.1360180231549; Wed, 06 Feb 2013 11:50:31 -0800 (PST) Received: from htj.dyndns.org (c-69-181-251-227.hsd1.ca.comcast.net. [69.181.251.227]) by mx.google.com with ESMTPS id l5sm39989590pax.10.2013.02.06.11.50.30 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 06 Feb 2013 11:50:30 -0800 (PST) From: Tejun Heo To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Tejun Heo , linux-rdma@vger.kernel.org Subject: [PATCH 41/77] IB/cxgb4: convert to idr_alloc() Date: Wed, 6 Feb 2013 11:40:13 -0800 Message-Id: <1360179649-22465-42-git-send-email-tj@kernel.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1360179649-22465-1-git-send-email-tj@kernel.org> References: <1360179649-22465-1-git-send-email-tj@kernel.org> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Convert to the much saner new idr interface. Only compile tested. Signed-off-by: Tejun Heo Reviewed-by: Steve Wise Cc: linux-rdma@vger.kernel.org --- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index 9c1644f..7f862da 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -260,20 +260,21 @@ static inline int _insert_handle(struct c4iw_dev *rhp, struct idr *idr, void *handle, u32 id, int lock) { int ret; - int newid; - do { - if (!idr_pre_get(idr, lock ? GFP_KERNEL : GFP_ATOMIC)) - return -ENOMEM; - if (lock) - spin_lock_irq(&rhp->lock); - ret = idr_get_new_above(idr, handle, id, &newid); - BUG_ON(!ret && newid != id); - if (lock) - spin_unlock_irq(&rhp->lock); - } while (ret == -EAGAIN); - - return ret; + if (lock) { + idr_preload(GFP_KERNEL); + spin_lock_irq(&rhp->lock); + } + + ret = idr_alloc(idr, handle, id, id + 1, GFP_ATOMIC); + + if (lock) { + spin_unlock_irq(&rhp->lock); + idr_preload_end(); + } + + BUG_ON(ret == -ENOSPC); + return ret < 0 ? ret : 0; } static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr,