[PATCH] __bdevname leak fix

The __bdevname library function is leaking module references due to

	__bdevname
 	->get_gendisk
 	  ->kobj_lookup
 	    ->ata_probe
 	      ->get_disk
 	        ->try_module_get

What we're trying to do in there is too ambitious.  Change it to just print
the major and minor.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 15 deletions

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index cc107c30d8bc23..cc37e011f10d0b 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -137,25 +137,14 @@ const char *bdevname(struct block_device *bdev, char *buf)
 EXPORT_SYMBOL(bdevname);
 
 /*
- * NOTE: this cannot be called from interrupt context.
- *
- * But in interrupt context you should really have a struct
- * block_device anyway and use bdevname() above.
+ * There's very little reason to use this, you should really
+ * have a struct block_device just about everywhere and use
+ * bdevname() instead.
  */
 const char *__bdevname(dev_t dev, char *buffer)
 {
-	struct gendisk *disk;
-	int part;
-
-	disk = get_gendisk(dev, &part);
-	if (disk) {
-		buffer = disk_name(disk, part, buffer);
-		put_disk(disk);
-	} else {
-		snprintf(buffer, BDEVNAME_SIZE, "unknown-block(%u,%u)",
+	scnprintf(buffer, BDEVNAME_SIZE, "unknown-block(%u,%u)",
 				MAJOR(dev), MINOR(dev));
-	}
-
 	return buffer;
 }