Re: [PATCH] bcache: release the allocated id, not its multiple of BCACHE_MINORS

From: Liang Chen
Date: Fri Jun 23 2017 - 07:38:20 EST


Hi Coly,
Thanks for letting me know. Glad to see it's fixed.

Thanks,
Liang

On Fri, Jun 23, 2017 at 3:30 PM, Coly Li <i@xxxxxxx> wrote:
> On 2017/6/23 äå3:15, Liang Chen wrote:
>> The id passed to ida_simple_remove has to be the one originally
>> allocated with ida_simple_get, not the one after multipling by
>> BCACHE_MINORS.
>>
>> Signed-off-by: Liang Chen <liangchen.linux@xxxxxxxxx>
>> ---
>> drivers/md/bcache/super.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
>> index e57353e..9f64477 100644
>> --- a/drivers/md/bcache/super.c
>> +++ b/drivers/md/bcache/super.c
>> @@ -734,7 +734,8 @@ static void bcache_device_free(struct bcache_device *d)
>> if (d->disk && d->disk->queue)
>> blk_cleanup_queue(d->disk->queue);
>> if (d->disk) {
>> - ida_simple_remove(&bcache_minor, d->disk->first_minor);
>> + ida_simple_remove(&bcache_minor,
>> + d->disk->first_minor / BCACHE_MINORS);
>> put_disk(d->disk);
>> }
>>
>> @@ -784,7 +785,7 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
>>
>> if (!(d->bio_split = bioset_create(4, offsetof(struct bbio, bio))) ||
>> !(d->disk = alloc_disk(BCACHE_MINORS))) {
>> - ida_simple_remove(&bcache_minor, minor);
>> + ida_simple_remove(&bcache_minor, minor / BCACHE_MINORS);
>> return -ENOMEM;
>> }
>>
>>
>
> Hi Liang,
>
> Junhui fixes it already, the patch is submitted to Jens Axboe already.
> Maybe the patch will show up in next merge window.
>
>
> --
> Coly Li