lkml.org 
[lkml]   [2013]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 49/62] uio: convert to idr_alloc()
    Date
    Convert to the much saner new idr interface.

    Only compile tested.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: "Hans J. Koch" <hjk@hansjkoch.de>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.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/uio/uio.c | 19 ++++---------------
    1 file changed, 4 insertions(+), 15 deletions(-)

    diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
    index 5110f36..c8b9262 100644
    --- a/drivers/uio/uio.c
    +++ b/drivers/uio/uio.c
    @@ -369,26 +369,15 @@ static void uio_dev_del_attributes(struct uio_device *idev)
    static int uio_get_minor(struct uio_device *idev)
    {
    int retval = -ENOMEM;
    - int id;

    mutex_lock(&minor_lock);
    - if (idr_pre_get(&uio_idr, GFP_KERNEL) == 0)
    - goto exit;
    -
    - retval = idr_get_new(&uio_idr, idev, &id);
    - if (retval < 0) {
    - if (retval == -EAGAIN)
    - retval = -ENOMEM;
    - goto exit;
    - }
    - if (id < UIO_MAX_DEVICES) {
    - idev->minor = id;
    - } else {
    + retval = idr_alloc(&uio_idr, idev, 0, UIO_MAX_DEVICES, GFP_KERNEL);
    + if (retval >= 0) {
    + idev->minor = retval;
    + } else if (retval == -ENOSPC) {
    dev_err(idev->dev, "too many uio devices\n");
    retval = -EINVAL;
    - idr_remove(&uio_idr, id);
    }
    -exit:
    mutex_unlock(&minor_lock);
    return retval;
    }
    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-03 03:41    [W:4.527 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site