block: remove support for delayed queue registrations

Now that device mapper has been changed to register the disk once
it is fully ready all this code is unused.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/block/elevator.c b/block/elevator.c
index 52ada14cfe45203b5b3e7aeed05a91cb87383385..706d5a64508d3a10c3ff8570c99d0c33925ed33d 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -702,7 +702,6 @@ void elevator_init_mq(struct request_queue *q)
                elevator_put(e);
        }
 }
-EXPORT_SYMBOL_GPL(elevator_init_mq); /* only for dm-rq */
 
 /*
  * switch to new_e io scheduler. be careful not to introduce deadlocks -

diff --git a/block/genhd.c b/block/genhd.c
index db916f77907762de3d7ec82dde4bffa9c6f5d15a..b0b6e0caa389692d155f98f9c365ba512ada01c3 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -475,20 +475,20 @@ static void register_disk(struct device *parent, struct gendisk *disk,
 }
 
 /**
- * __device_add_disk - add disk information to kernel list
+ * device_add_disk - add disk information to kernel list
  * @parent: parent device for the disk
  * @disk: per-device partitioning information
  * @groups: Additional per-device sysfs groups
- * @register_queue: register the queue if set to true
  *
  * This function registers the partitioning information in @disk
  * with the kernel.
  *
  * FIXME: error handling
  */
-static void __device_add_disk(struct device *parent, struct gendisk *disk,
-                             const struct attribute_group **groups,
-                             bool register_queue)
+
+void device_add_disk(struct device *parent, struct gendisk *disk,
+                    const struct attribute_group **groups)
+
 {
        int ret;
 
@@ -498,8 +498,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
         * elevator if one is needed, that is, for devices requesting queue
         * registration.
         */
-       if (register_queue)
-               elevator_init_mq(disk->queue);
+       elevator_init_mq(disk->queue);
 
        /*
         * If the driver provides an explicit major number it also must provide
@@ -553,8 +552,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
                bdev_add(disk->part0, dev->devt);
        }
        register_disk(parent, disk, groups);
-       if (register_queue)
-               blk_register_queue(disk);
+       blk_register_queue(disk);
 
        /*
         * Take an extra ref on queue which will be put on disk_release()
@@ -568,21 +566,8 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
        disk_add_events(disk);
        blk_integrity_add(disk);
 }
-
-void device_add_disk(struct device *parent, struct gendisk *disk,
-                    const struct attribute_group **groups)
-
-{
-       __device_add_disk(parent, disk, groups, true);
-}
 EXPORT_SYMBOL(device_add_disk);
 
-void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk)
-{
-       __device_add_disk(parent, disk, NULL, false);
-}
-EXPORT_SYMBOL(device_add_disk_no_queue_reg);
-
 /**
  * del_gendisk - remove the gendisk
  * @disk: the struct gendisk to remove

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 80952f038d7976b9d091edf8d06ff8825d84c8df..473d93c6ebda7efd3708e75fce3d89ff1eb6d373 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -219,12 +219,6 @@ static inline void add_disk(struct gendisk *disk)
 {
        device_add_disk(NULL, disk, NULL);
 }
-extern void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk);
-static inline void add_disk_no_queue_reg(struct gendisk *disk)
-{
-       device_add_disk_no_queue_reg(NULL, disk);
-}
-
 extern void del_gendisk(struct gendisk *gp);
 
 void set_disk_ro(struct gendisk *disk, bool read_only);