From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: Re: [PATCH 50/62] vfio: convert to idr_alloc() Date: Mon, 04 Feb 2013 09:06:33 -0700 Message-ID: <1359993993.11144.416.camel@bling.home> References: <1359854463-2538-1-git-send-email-tj@kernel.org> <1359854463-2538-51-git-send-email-tj@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, rusty@rustcorp.com.au, bfields@fieldses.org, skinsbursky@parallels.com, ebiederm@xmission.com, jmorris@namei.org, axboe@kernel.dk, kvm@vger.kernel.org To: Tejun Heo Return-path: In-Reply-To: <1359854463-2538-51-git-send-email-tj@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On Sat, 2013-02-02 at 17:20 -0800, Tejun Heo wrote: > Convert to the much saner new idr interface. > > Only compile tested. > > Signed-off-by: Tejun Heo > Cc: Alex Williamson > Cc: kvm@vger.kernel.org > --- > This patch depends on an earlier idr changes and I think it would be > best to route these together through -mm. Please holler if there's > any objection. Thanks. > > drivers/vfio/vfio.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 12c264d..0132846 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -139,23 +139,7 @@ EXPORT_SYMBOL_GPL(vfio_unregister_iommu_driver); > */ > static int vfio_alloc_group_minor(struct vfio_group *group) > { > - int ret, minor; > - > -again: > - if (unlikely(idr_pre_get(&vfio.group_idr, GFP_KERNEL) == 0)) > - return -ENOMEM; > - > - /* index 0 is used by /dev/vfio/vfio */ I'd have preferred to keep this comment. If you do a v2, please keep it, otherwise I'll add it back later. Acked-by: Alex Williamson > - ret = idr_get_new_above(&vfio.group_idr, group, 1, &minor); > - if (ret == -EAGAIN) > - goto again; > - if (ret || minor > MINORMASK) { > - if (minor > MINORMASK) > - idr_remove(&vfio.group_idr, minor); > - return -ENOSPC; > - } > - > - return minor; > + return idr_alloc(&vfio.group_idr, group, 1, MINORMASK + 1, GFP_KERNEL); > } > > static void vfio_free_group_minor(int minor)