diff options
author | Alasdair G Kergon <agk@redhat.com> | 2011-08-02 12:32:01 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-08 10:23:21 -0700 |
commit | 3d247615d6b54f39e32b9b27a148e4a88dd3b9ca (patch) | |
tree | b5f6445de39573256dfd8fb0124d0d9a5f2d64fa | |
parent | c72ff34c937a4572946fdcd79ecbff2fe81f7654 (diff) | |
download | lwn-3d247615d6b54f39e32b9b27a148e4a88dd3b9ca.tar.gz lwn-3d247615d6b54f39e32b9b27a148e4a88dd3b9ca.zip |
dm: fix idr leak on module removal
commit d15b774c2920d55e3d58275c97fbe3adc3afde38 upstream.
Destroy _minor_idr when unloading the core dm module. (Found by kmemleak.)
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/md/dm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index d1866878a814..c988ac2d8c96 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -36,6 +36,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. @@ -315,6 +317,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); } /* @@ -1663,8 +1671,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); |