This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / partitions / check.c

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 3526d36..cc37e01 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -29,7 +29,6 @@
 #include "ldm.h"
 #include "mac.h"
 #include "msdos.h"
-#include "nec98.h"
 #include "osf.h"
 #include "sgi.h"
 #include "sun.h"
@@ -138,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;
 }
 
@@ -367,6 +355,9 @@ void register_disk(struct gendisk *disk)
                return;
 
        bdev = bdget_disk(disk, 0);
+       if (!bdev)
+               return;
+
        if (blkdev_get(bdev, FMODE_READ, 0) < 0)
                return;
        state = check_partition(disk, bdev);