Re: [PATCH] block: Directly use ida_alloc()/free()

[Christophe JAILLET]

Le 15/06/2022 à 10:18, Bo Liu a écrit :
> Use ida_alloc()/ida_free() instead of
> ida_simple_get()/ida_simple_remove().
> The latter is deprecated and more verbose.
>
> Signed-off-by: Bo Liu <liubo03@xxxxxxxxxx>

Hi,
for what it's worth:

Reviewed-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>

> ---
>   block/blk-core.c  | 4 ++--
>   block/blk-sysfs.c | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 06ff5bbfe8f6..eb86c756a7fd 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -448,7 +448,7 @@ struct request_queue *blk_alloc_queue(int node_id, bool alloc_srcu)
>   
>   	q->last_merge = NULL;
>   
> -	q->id = ida_simple_get(&blk_queue_ida, 0, 0, GFP_KERNEL);
> +	q->id = ida_alloc(&blk_queue_ida, GFP_KERNEL);
>   	if (q->id < 0)
>   		goto fail_srcu;
>   
> @@ -498,7 +498,7 @@ struct request_queue *blk_alloc_queue(int node_id, bool alloc_srcu)
>   fail_split:
>   	bioset_exit(&q->bio_split);
>   fail_id:
> -	ida_simple_remove(&blk_queue_ida, q->id);
> +	ida_free(&blk_queue_ida, q->id);
>   fail_srcu:
>   	if (alloc_srcu)
>   		cleanup_srcu_struct(q->srcu);
> diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
> index 14607565d781..2ed9e7d52b47 100644
> --- a/block/blk-sysfs.c
> +++ b/block/blk-sysfs.c
> @@ -799,7 +799,7 @@ static void blk_release_queue(struct kobject *kobj)
>   	if (blk_queue_has_srcu(q))
>   		cleanup_srcu_struct(q->srcu);
>   
> -	ida_simple_remove(&blk_queue_ida, q->id);
> +	ida_free(&blk_queue_ida, q->id);
>   	call_rcu(&q->rcu_head, blk_free_queue_rcu);
>   }
>