From: Ishai Rabinovitz <ishai@mellanox.co.il>
Date: Tue, 3 Oct 2006 08:15:22 +0000 (-0700)
Subject: [PATCH] dm: fix alloc_dev error path
X-Git-Tag: v2.6.19-rc1~278
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3f6ac6123be6f4ba14d71af0da0e8d3d39c33ed;p=linux-2.6-omap-h63xx.git

[PATCH] dm: fix alloc_dev error path

While reading the code I found a bug in the error path in alloc_dev in dm.c

When blk_alloc_queue fails there is no call to free_minor.

This patch fixes the problem.

Signed-off-by: Ishai Rabinovitz <ishai@mellanox.co.il>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 5792686936c..81717e27332 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -943,7 +943,7 @@ static struct mapped_device *alloc_dev(int minor)
 
 	md->queue = blk_alloc_queue(GFP_KERNEL);
 	if (!md->queue)
-		goto bad1;
+		goto bad1_free_minor;
 
 	md->queue->queuedata = md;
 	md->queue->backing_dev_info.congested_fn = dm_any_congested;
@@ -993,6 +993,7 @@ static struct mapped_device *alloc_dev(int minor)
 	mempool_destroy(md->io_pool);
  bad2:
 	blk_cleanup_queue(md->queue);
+ bad1_free_minor:
 	free_minor(minor);
  bad1:
 	module_put(THIS_MODULE);