Skip to content

Commit 95931a2

Browse files
tititiou36axboe
authored andcommitted
null_blk: Remove usage of the deprecated ida_simple_xx() API
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove(). This is less verbose. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/bf257b1078475a415cdc3344c6a750842946e367.1705222845.git.christophe.jaillet@wanadoo.fr Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 7b4f36c commit 95931a2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/block/null_blk/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,7 +1840,7 @@ static void null_del_dev(struct nullb *nullb)
18401840

18411841
dev = nullb->dev;
18421842

1843-
ida_simple_remove(&nullb_indexes, nullb->index);
1843+
ida_free(&nullb_indexes, nullb->index);
18441844

18451845
list_del_init(&nullb->list);
18461846

@@ -2174,7 +2174,7 @@ static int null_add_dev(struct nullb_device *dev)
21742174
blk_queue_flag_set(QUEUE_FLAG_NONROT, nullb->q);
21752175

21762176
mutex_lock(&lock);
2177-
rv = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);
2177+
rv = ida_alloc(&nullb_indexes, GFP_KERNEL);
21782178
if (rv < 0) {
21792179
mutex_unlock(&lock);
21802180
goto out_cleanup_zone;

0 commit comments

Comments
 (0)