Commit 92a34c46 authored by Pankaj Raghav's avatar Pankaj Raghav Committed by Jens Axboe

virtio-blk: replace ida_simple[get|remove] with ida_[alloc_range|free]

ida_simple[get|remove] are deprecated, and are just wrappers to
ida_[alloc_range|free]. Replace ida_simple[get|remove] with their
corresponding counterparts.

No functional changes.
Signed-off-by: default avatarPankaj Raghav <p.raghav@samsung.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Link: https://lore.kernel.org/r/20221130123001.25473-1-p.raghav@samsung.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 63f93fd6
...@@ -512,7 +512,7 @@ static void virtblk_free_disk(struct gendisk *disk) ...@@ -512,7 +512,7 @@ static void virtblk_free_disk(struct gendisk *disk)
{ {
struct virtio_blk *vblk = disk->private_data; struct virtio_blk *vblk = disk->private_data;
ida_simple_remove(&vd_index_ida, vblk->index); ida_free(&vd_index_ida, vblk->index);
mutex_destroy(&vblk->vdev_mutex); mutex_destroy(&vblk->vdev_mutex);
kfree(vblk); kfree(vblk);
} }
...@@ -902,8 +902,8 @@ static int virtblk_probe(struct virtio_device *vdev) ...@@ -902,8 +902,8 @@ static int virtblk_probe(struct virtio_device *vdev)
return -EINVAL; return -EINVAL;
} }
err = ida_simple_get(&vd_index_ida, 0, minor_to_index(1 << MINORBITS), err = ida_alloc_range(&vd_index_ida, 0,
GFP_KERNEL); minor_to_index(1 << MINORBITS) - 1, GFP_KERNEL);
if (err < 0) if (err < 0)
goto out; goto out;
index = err; index = err;
...@@ -1163,7 +1163,7 @@ static int virtblk_probe(struct virtio_device *vdev) ...@@ -1163,7 +1163,7 @@ static int virtblk_probe(struct virtio_device *vdev)
out_free_vblk: out_free_vblk:
kfree(vblk); kfree(vblk);
out_free_index: out_free_index:
ida_simple_remove(&vd_index_ida, index); ida_free(&vd_index_ida, index);
out: out:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment