lkml.org 
[lkml]   [2013]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 54/77] macvtap: 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: Jason Wang <jasowang@redhat.com>
    Cc: Michael S. Tsirkin <mst@redhat.com>
    ---
    drivers/net/macvtap.c | 21 +++++----------------
    1 file changed, 5 insertions(+), 16 deletions(-)

    diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
    index b181dfb..1814cfe 100644
    --- a/drivers/net/macvtap.c
    +++ b/drivers/net/macvtap.c
    @@ -279,28 +279,17 @@ static int macvtap_receive(struct sk_buff *skb)
    static int macvtap_get_minor(struct macvlan_dev *vlan)
    {
    int retval = -ENOMEM;
    - int id;

    mutex_lock(&minor_lock);
    - if (idr_pre_get(&minor_idr, GFP_KERNEL) == 0)
    - goto exit;
    -
    - retval = idr_get_new_above(&minor_idr, vlan, 1, &id);
    - if (retval < 0) {
    - if (retval == -EAGAIN)
    - retval = -ENOMEM;
    - goto exit;
    - }
    - if (id < MACVTAP_NUM_DEVS) {
    - vlan->minor = id;
    - } else {
    + retval = idr_alloc(&minor_idr, vlan, 1, MACVTAP_NUM_DEVS, GFP_KERNEL);
    + if (retval >= 0) {
    + vlan->minor = retval;
    + } else if (retval == -ENOSPC) {
    printk(KERN_ERR "too many macvtap devices\n");
    retval = -EINVAL;
    - idr_remove(&minor_idr, id);
    }
    -exit:
    mutex_unlock(&minor_lock);
    - return retval;
    + return retval < 0 ? retval : 0;
    }

    static void macvtap_free_minor(struct macvlan_dev *vlan)
    --
    1.8.1


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