[PATCH v4 2/6] md: Delete gendisk before cleaning up the request queue

[Bart Van Assche]

Remove the disk, partition and bdi sysfs attributes before cleaning up
the request queue associated with the disk.

Signed-off-by: Bart Van Assche <bart.vanass...@wdc.com>
Cc: Shaohua Li <s...@kernel.org>
---
 drivers/md/md.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index bc67ab6844f0..eba7fa2f0abb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5203,12 +5203,12 @@ static void md_free(struct kobject *ko)
        if (mddev->sysfs_state)
                sysfs_put(mddev->sysfs_state);
 
+       if (mddev->gendisk)
+               del_gendisk(mddev->gendisk);
        if (mddev->queue)
                blk_cleanup_queue(mddev->queue);
-       if (mddev->gendisk) {
-               del_gendisk(mddev->gendisk);
+       if (mddev->gendisk)
                put_disk(mddev->gendisk);
-       }
        percpu_ref_exit(&mddev->writes_pending);
 
        kfree(mddev);
-- 
2.16.2