-stable review patch. If anyone has any objections, please let us know.
------------------
Minor number should be freed after del_gendisk(). Otherwise, there could
be a window where 2 registered gendisk has same minor number.
Signed-off-by: Jun'ichi Nomura <[email protected]>
Acked-by: Alasdair G Kergon <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
[chrisw: backport to 2.6.15]
Signed-off-by: Chris Wright <[email protected]>
---
drivers/md/dm.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
--- linux-2.6.15.4.orig/drivers/md/dm.c
+++ linux-2.6.15.4/drivers/md/dm.c
@@ -812,14 +812,16 @@ static struct mapped_device *alloc_dev(u
static void free_dev(struct mapped_device *md)
{
+ unsigned int minor = md->disk->first_minor;
+
if (md->frozen_bdev) {
thaw_bdev(md->frozen_bdev, NULL);
bdput(md->frozen_bdev);
}
- free_minor(md->disk->first_minor);
mempool_destroy(md->tio_pool);
mempool_destroy(md->io_pool);
del_gendisk(md->disk);
+ free_minor(minor);
put_disk(md->disk);
blk_put_queue(md->queue);
kfree(md);
--