bcache: release the allocated id, not its multiple of BCACHE_MINORS
PATCH 1/1 bcache: release the allocated id, not its multiple of BCACHE_MINORS
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.
--- drivers/md/bcache/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/md/bcache/super.c +3 -2
@@ -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 ; }
Signature · 1 line
1.8.3.1
Quoted 25 lines · Liang Chen
The id passed to
ida_simple_removehas to be the one originally allocated withida_simple_get, not the one after multipling byBCACHE_MINORS.Signed-off-by Liang Chen <[email protected]>--- drivers/md/bcache/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/md/bcache/super.c +2
-1@@ -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); }
drivers/md/bcache/super.c static int bcache_device_init(struct bcache_device *d, unsigned block_size, · line 791
Quoted 8 lines
drivers/md/bcache/super.c +1
-1@@ -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.
Signature · 1 line
Coly Li
Hi Coly,
Thanks for letting me know. Glad to see it's fixed.
Thanks,
Liang
Quoted 43 lines · Coly Li
Quoted 25 lines · Liang Chen
The id passed to
ida_simple_removehas to be the one originally allocated withida_simple_get, not the one after multipling byBCACHE_MINORS.Signed-off-by Liang Chen <[email protected]>--- drivers/md/bcache/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/md/bcache/super.c +2
-1@@ -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); }drivers/md/bcache/super.c static int bcache_device_init(struct bcache_device *d, unsigned block_size, · line 791
Quoted 8 lines
drivers/md/bcache/super.c +1
-1@@ -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
A message that is not in the archive (sent off-list or not yet received): OF8F24365F.31FA34A2-ON48258148.00287923-48258148.002900E3@zte.com.cn
Sure! I will find you there:)
Quoted 72 lines · On Fri, Jun 23, 2017 at 3:28 PM, <[email protected]> wrote:
Hello Liang chen:
Please see this patch:
http://www.spinics.net/lists/linux-bcache/msg04572.html
Do you have a wechat account? please add me: tangjunhui1984
We can talk more about bcache.
Thanks.
发件人: Liang Chen <[email protected]>
收件人: [email protected],
抄送: [email protected], [email protected],
[email protected], Liang Chen <[email protected]>
日期: 2017/06/23 15:16
主题: [PATCH] bcache: release the allocated id, not its multiple ofBCACHE_MINORS
发件人: [email protected]
________________________________The id passed to
ida_simple_removehas to be the one originally allocated withida_simple_get, not the one after multipling byBCACHE_MINORS.Signed-off-by Liang Chen <[email protected]>---
drivers/md/bcache/super.c| 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)drivers/md/bcache/super.c +2
-1@@ -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);}drivers/md/bcache/super.c +0
-0@@ -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))) {drivers/md/bcache/super.c +1
-1-ida_simple_remove (&bcache_minor, minor); + ida_simple_remove(&bcache_minor, minor /BCACHE_MINORS); return -ENOMEM; }--
1.8.3.1--
To unsubscribe from this list: send the line "unsubscribe linux-bcache" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html