Skip to content

Commit af40404

Browse files
tititiou36gregkh
authored andcommitted
null_blk: Remove usage of the deprecated ida_simple_xx() API
commit 95931a245b44ee04f3359ec432e73614d44d8b38 upstream. 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 <[email protected]> Link: https://lore.kernel.org/r/bf257b1078475a415cdc3344c6a750842946e367.1705222845.git.christophe.jaillet@wanadoo.fr Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Xiangyu Chen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent c2dcdaa commit af40404

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
@@ -1764,7 +1764,7 @@ static void null_del_dev(struct nullb *nullb)
17641764

17651765
dev = nullb->dev;
17661766

1767-
ida_simple_remove(&nullb_indexes, nullb->index);
1767+
ida_free(&nullb_indexes, nullb->index);
17681768

17691769
list_del_init(&nullb->list);
17701770

@@ -2103,7 +2103,7 @@ static int null_add_dev(struct nullb_device *dev)
21032103
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, nullb->q);
21042104

21052105
mutex_lock(&lock);
2106-
rv = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);
2106+
rv = ida_alloc(&nullb_indexes, GFP_KERNEL);
21072107
if (rv < 0) {
21082108
mutex_unlock(&lock);
21092109
goto out_cleanup_zone;

0 commit comments

Comments
 (0)