block: order /proc/devices by major number

Presently, the order of the block devices listed in /proc/devices is not
entirely sequential. If a block device has a major number greater than
BLKDEV_MAJOR_HASH_SIZE (255), it will be ordered as if its major were
module 255. For example, 511 appears after 1.

This patch cleans that up and prints each major number in the correct
order, regardless of where they are stored in the hash table.

In order to do this, we introduce BLKDEV_MAJOR_MAX as an artificial
limit (chosen to be 512). It will then print all devices in major
order number from 0 to the maximum.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jeff Layton <jlayton@poochiereds.net>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 13 insertions, 5 deletions

diff --git a/block/genhd.c b/block/genhd.c
index 7f520fa25d16..51c1d407d93c 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -242,6 +242,7 @@ EXPORT_SYMBOL_GPL(disk_map_sector_rcu);
  * Can be deleted altogether. Later.
  *
  */
+#define BLKDEV_MAJOR_HASH_SIZE 255
 static struct blk_major_name {
         struct blk_major_name *next;
         int major;
@@ -259,12 +260,11 @@ void blkdev_show(struct seq_file *seqf, off_t offset)
 {
         struct blk_major_name *dp;
 
-        if (offset < BLKDEV_MAJOR_HASH_SIZE) {
-                mutex_lock(&block_class_lock);
-                for (dp = major_names[offset]; dp; dp = dp->next)
+        mutex_lock(&block_class_lock);
+        for (dp = major_names[major_to_index(offset)]; dp; dp = dp->next)
+                if (dp->major == offset)
                         seq_printf(seqf, "%3d %s\n", dp->major, dp->name);
-                mutex_unlock(&block_class_lock);
-        }
+        mutex_unlock(&block_class_lock);
 }
 #endif /* CONFIG_PROC_FS */
 
@@ -309,6 +309,14 @@ int register_blkdev(unsigned int major, const char *name)
                 ret = major;
         }
 
+        if (major >= BLKDEV_MAJOR_MAX) {
+                pr_err("register_blkdev: major requested (%d) is greater than the maximum (%d) for %s\n",
+                       major, BLKDEV_MAJOR_MAX, name);
+
+                ret = -EINVAL;
+                goto out;
+        }
+
         p = kmalloc(sizeof(struct blk_major_name), GFP_KERNEL);
         if (p == NULL) {
                 ret = -ENOMEM;