[PATCH] make __bdevname output more similar to bdevname

Currently __bdevname walks the obsolete list of block majors to
find a name for the given dev_t and falls back to unknown-block(%u,%u)
if that's not possible.  Replace this with an attempted get_gendisk() +
disk_name.  This means __bdevname can't be called from irq context
anymore, but as all old irq context callers are using bdevname() now
that fine (and I've added a big comment).

diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index fe922bcc5805979e7a12af6d8d7c85449eda3338..237baeeaabf2307f3a56f5cca4022001b61e1255 100644 (file)
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -52,30 +52,6 @@ static inline int dev_to_index(dev_t dev)
        return major_to_index(MAJOR(dev));
 }
 
-/*
- * __bdevname may be called from interrupts, and must be atomic
- */
-const char *__bdevname(dev_t dev, char *buffer)
-{
-       char *name = "unknown-block";
-       unsigned int major = MAJOR(dev);
-       unsigned int minor = MINOR(dev);
-       int index = major_to_index(major);
-       struct blk_major_name *n;
-       unsigned long flags;
-
-       spin_lock_irqsave(&major_names_lock, flags);
-       for (n = major_names[index]; n; n = n->next)
-               if (n->major == major)
-                       break;
-       if (n)
-               name = &(n->name[0]);
-       snprintf(buffer, BDEVNAME_SIZE, "%s(%u,%u)", name, major, minor);
-       spin_unlock_irqrestore(&major_names_lock, flags);
-
-       return buffer;
-}
-
 /* get block device names in somewhat random order */
 int get_blkdev_list(char *p)
 {

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 591123911467df7a491f4b759c9f0d5d51fd4a6d..0c2ef6854f47ea878a597261f12790cfbe8b765b 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -125,6 +125,29 @@ const char *bdevname(struct block_device *bdev, char *buf)
        return disk_name(bdev->bd_disk, part, buf);
 }
 
+/*
+ * 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.
+ */
+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)",
+                               MAJOR(dev), MINOR(dev));
+       }
+
+       return buffer;
+}
+
 static struct parsed_partitions *
 check_partition(struct gendisk *hd, struct block_device *bdev)
 {