From c400b85bc11deb9b069daa0115ee48c2172dbdb3 Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Tue, 2 Aug 2011 12:32:01 +0100
Subject: [PATCH] --- yaml --- r: 262184 b: refs/heads/master c:
 d15b774c2920d55e3d58275c97fbe3adc3afde38 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/drivers/md/dm.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4efbef404032..b4fabaa5576a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb91bc7bacb906c9f3a9b22744c53fa7564b51ba
+refs/heads/master: d15b774c2920d55e3d58275c97fbe3adc3afde38
diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index 0cf68b478878..41abc6dd481b 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/drivers/md/dm.c
@@ -37,6 +37,8 @@ static const char *_name = DM_NAME;
 static unsigned int major = 0;
 static unsigned int _major = 0;
 
+static DEFINE_IDR(_minor_idr);
+
 static DEFINE_SPINLOCK(_minor_lock);
 /*
  * For bio-based dm.
@@ -313,6 +315,12 @@ static void __exit dm_exit(void)
 
 	while (i--)
 		_exits[i]();
+
+	/*
+	 * Should be empty by this point.
+	 */
+	idr_remove_all(&_minor_idr);
+	idr_destroy(&_minor_idr);
 }
 
 /*
@@ -1705,8 +1713,6 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
 /*-----------------------------------------------------------------
  * An IDR is used to keep track of allocated minor numbers.
  *---------------------------------------------------------------*/
-static DEFINE_IDR(_minor_idr);
-
 static void free_minor(int minor)
 {
 	spin_lock(&_minor_lock);