[PATCH 1/2] null_blk: Fix an error handling path in null_add_dev()

[PATCH 1/2] null_blk: Fix an error handling path in null_add_dev()

[Christophe JAILLET]

In case of error, call to ida_simple_get() must be undone in the error
handling path.

Fixes: a0725ab0c753 ("Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/block/null_blk/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index 05b1120e6623..a330a118659d 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -2074,6 +2074,7 @@ static int null_add_dev(struct nullb_device *dev)
 	return 0;
 out_cleanup_zone:
 	null_free_zoned_dev(dev);
+	ida_free(&nullb_indexes, nullb->index);
 out_cleanup_disk:
 	blk_cleanup_disk(nullb->disk);
 out_cleanup_tags:
-- 
2.32.0

[PATCH 2/2] null_blk: Update ida_simple_get()/ida_simple_remove() to the newer ida API

[Christophe JAILLET]

ida_simple_get() and ida_simple_remove() are deprecated. Use ida_alloc()
and ida_free() instead. It is less verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/block/null_blk/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index a330a118659d..6b4248cc310a 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -1724,7 +1724,7 @@ static void null_del_dev(struct nullb *nullb)
 
 	dev = nullb->dev;
 
-	ida_simple_remove(&nullb_indexes, nullb->index);
+	ida_free(&nullb_indexes, nullb->index);
 
 	list_del_init(&nullb->list);
 
@@ -2044,7 +2044,7 @@ static int null_add_dev(struct nullb_device *dev)
 	blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, nullb->q);
 
 	mutex_lock(&lock);
-	nullb->index = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);
+	nullb->index = ida_alloc(&nullb_indexes, GFP_KERNEL);
 	dev->index = nullb->index;
 	mutex_unlock(&lock);
 
-- 
2.32.0

Re: [PATCH 2/2] null_blk: Update ida_simple_get()/ida_simple_remove() to the newer ida API

[Chaitanya Kulkarni]

> On Mar 27, 2022, at 11:48 AM, Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> 
> ida_simple_get() and ida_simple_remove() are deprecated. Use ida_alloc()
> and ida_free() instead. It is less verbose.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> 

I have alredy sent out patch for this....

Re: [PATCH 2/2] null_blk: Update ida_simple_get()/ida_simple_remove() to the newer ida API

[Christophe JAILLET]

Le 28/03/2022 à 05:00, Chaitanya Kulkarni a écrit :
> 
>> On Mar 27, 2022, at 11:48 AM, Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
>>
>> ida_simple_get() and ida_simple_remove() are deprecated. Use ida_alloc()
>> and ida_free() instead. It is less verbose.
>>
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>>
> 
> I have alredy sent out patch for this....
> 
> 
Hi,

I was not aware of it...

Do you plan to send patches for all ida_xxx() changes that are needed 
all over the kernel or is it only limited to 
'drivers/block/null_blk/main.c'?

(read: should I spend time on it, or is the phasing out of this 
deprecated API is already on the todo list of someone)

CJ