[PATCH 35/78] block: cleanup del_gendisk a bit

[Christoph Hellwig <hch@xxxxxx>]

Merge three hidden gendisk checks into one.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
---
 block/genhd.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index b0f0b0cac9aa7f..8180195b76634b 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -892,6 +892,9 @@ void del_gendisk(struct gendisk *disk)
 
        might_sleep();
 
+       if (WARN_ON_ONCE(!disk->queue))
+               return;
+
        blk_integrity_del(disk);
        disk_del_events(disk);
 
@@ -914,20 +917,18 @@ void del_gendisk(struct gendisk *disk)
        disk->flags &= ~GENHD_FL_UP;
        up_write(&disk->lookup_sem);
 
-       if (!(disk->flags & GENHD_FL_HIDDEN))
+       if (!(disk->flags & GENHD_FL_HIDDEN)) {
                sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi");
-       if (disk->queue) {
+
                /*
                 * Unregister bdi before releasing device numbers (as they can
                 * get reused and we'd get clashes in sysfs).
                 */
-               if (!(disk->flags & GENHD_FL_HIDDEN))
-                       bdi_unregister(disk->queue->backing_dev_info);
-               blk_unregister_queue(disk);
-       } else {
-               WARN_ON(1);
+               bdi_unregister(disk->queue->backing_dev_info);
        }
 
+       blk_unregister_queue(disk);
+       
        if (!(disk->flags & GENHD_FL_HIDDEN))
                blk_unregister_region(disk_devt(disk), disk->minors);
        /*
-- 
2.29.2