Received-SPF: pass (google.com: domain of linux-kernel+bounces-27420-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Precedence: bulk
MIME-Version: 1.0
References: <7d98d8d45a89fc2434dd71d573fe4c6986986513.1705351057.git.christophe.jaillet@wanadoo.fr>
In-Reply-To: <7d98d8d45a89fc2434dd71d573fe4c6986986513.1705351057.git.christophe.jaillet@wanadoo.fr>
From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 16 Jan 2024 14:30:05 +0100
Message-ID: <CAOi1vP-5Kp3z7+-pa2Rb_xTATKq7zN0a2eACeJNWw2zj=rr6JA@mail.gmail.com>
Subject: Re: [PATCH] rbd: Remove usage of the deprecated ida_simple_xx() API
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Dongsheng Yang <dongsheng.yang@easystack.cn>, Jens Axboe <axboe@kernel.dk>, 
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, 
	ceph-devel@vger.kernel.org, linux-block@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 15, 2024 at 9:37=E2=80=AFPM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> 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@wanadoo.fr>
> ---
>  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 =3D ida_simple_get(&rbd_dev_id_ida, 0,
> -                                        minor_to_rbd_dev_id(1 << MINORBI=
TS),
> -                                        GFP_KERNEL);
> +       rbd_dev->dev_id =3D ida_alloc_max(&rbd_dev_id_ida,
> +                                       minor_to_rbd_dev_id(1 << MINORBIT=
S) - 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