Commit 798f2a6f authored by Bo Liu's avatar Bo Liu Committed by Jens Axboe
Browse files

block: Directly use ida_alloc()/free() 



Use ida_alloc()/ida_free() instead of
ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.

Signed-off-by: default avatarBo Liu <liubo03@inspur.com>
Reviewed-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20220615081816.4342-1-liubo03@inspur.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bf8d0853

block/blk-core.c

+2 −2
Original line number Diff line number Diff line
@@ -435,7 +435,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;
@@ -485,7 +485,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);

block/blk-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,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);

}