mtip32xx: fix rmmod issue

Orabug: 23331083

[ Upstream commit 02b48265e7437bfe153af16337b14ee74f00905f ]

put_disk() need to be called after del_gendisk() to free the disk object structure.

Signed-off-by: Selvan Mani <smani@micron.com>
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 6b9d9c35930bd75ddcfafb8eb7db909ceb63af10)

Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index be967eceb340875dce514303a63dfb606f8403f3..898eb601695bf69bb66295c8658f8a25bb3d202f 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2813,6 +2813,7 @@ static int mtip_free_orphan(struct driver_data *dd)
                                kobject_put(kobj);
                        }
                        del_gendisk(dd->disk);
+                       put_disk(dd->disk);
                        dd->disk = NULL;
                }
                if (dd->queue) {
@@ -4103,13 +4104,13 @@ static int mtip_block_remove(struct driver_data *dd)
                        dd->bdev = NULL;
                }
                if (dd->disk) {
+                       del_gendisk(dd->disk);
                        if (dd->disk->queue) {
-                               del_gendisk(dd->disk);
                                blk_cleanup_queue(dd->queue);
                                blk_mq_free_tag_set(&dd->tags);
                                dd->queue = NULL;
-                       } else
-                               put_disk(dd->disk);
+                       }
+                       put_disk(dd->disk);
                }
                dd->disk  = NULL;
 
@@ -4148,12 +4149,12 @@ static int mtip_block_shutdown(struct driver_data *dd)
                dev_info(&dd->pdev->dev,
                        "Shutting down %s ...\n", dd->disk->disk_name);
 
+               del_gendisk(dd->disk);
                if (dd->disk->queue) {
-                       del_gendisk(dd->disk);
                        blk_cleanup_queue(dd->queue);
                        blk_mq_free_tag_set(&dd->tags);
-               } else
-                       put_disk(dd->disk);
+               }
+               put_disk(dd->disk);
                dd->disk  = NULL;
                dd->queue = NULL;
        }