On Mon, Jan 15, 2024 at 9:37 PM Christophe JAILLET
<christophe.jaillet@xxxxxxxxxx> wrote:
>
> ida_alloc() and ida_free() should be preferred to the deprecated
> ida_simple_get() and ida_simple_remove().
>
> Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of
> ida_alloc_max() is inclusive. So a -1 has been added when needed.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
> ---
> drivers/block/rbd.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index a999b698b131..63897d0d6629 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -5326,7 +5326,7 @@ static void rbd_dev_release(struct device *dev)
>
> if (need_put) {
> destroy_workqueue(rbd_dev->task_wq);
> - ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id);
> + ida_free(&rbd_dev_id_ida, rbd_dev->dev_id);
> }
>
> rbd_dev_free(rbd_dev);
> @@ -5402,9 +5402,9 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc,
> return NULL;
>
> /* get an id and fill in device name */
> - rbd_dev->dev_id = ida_simple_get(&rbd_dev_id_ida, 0,
> - minor_to_rbd_dev_id(1 << MINORBITS),
> - GFP_KERNEL);
> + rbd_dev->dev_id = ida_alloc_max(&rbd_dev_id_ida,
> + minor_to_rbd_dev_id(1 << MINORBITS) - 1,
> + GFP_KERNEL);
> if (rbd_dev->dev_id < 0)
> goto fail_rbd_dev;
>
> @@ -5425,7 +5425,7 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc,
> return rbd_dev;
>
> fail_dev_id:
> - ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id);
> + ida_free(&rbd_dev_id_ida, rbd_dev->dev_id);
> fail_rbd_dev:
> rbd_dev_free(rbd_dev);
> return NULL;
> --
> 2.43.0
>
Applied.
Thanks,
Ilya
