Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59872e56 authored by Asai Thambi SP's avatar Asai Thambi SP Committed by Sasha Levin
Browse files

mtip32xx: Fix for rmmod crash when drive is in FTL rebuild 



[ Upstream commit 59cf70e236c96594d9f1e065755d8fce9df5356b ]

When FTL rebuild is in progress, alloc_disk() initializes the disk
but device node will be created by add_disk() only after successful
completion of FTL rebuild. So, skip deletion of device node in
removal path when FTL rebuild is in progress.

Signed-off-by: default avatarSelvan Mani <smani@micron.com>
Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent dcfd994d

drivers/block/mtip32xx/mtip32xx.c

+7 −7
Original line number Diff line number Diff line
@@ -3004,9 +3004,7 @@ restart_eh: 
		}



		if (test_bit(MTIP_PF_REBUILD_BIT, &port->flags)) {

			if (mtip_ftl_rebuild_poll(dd) < 0)

				set_bit(MTIP_DDF_REBUILD_FAILED_BIT,

							&dd->dd_flag);

			if (mtip_ftl_rebuild_poll(dd) == 0)

				clear_bit(MTIP_PF_REBUILD_BIT, &port->flags);

		}

	}
@@ -3886,7 +3884,6 @@ static int mtip_block_initialize(struct driver_data *dd) 


	mtip_hw_debugfs_init(dd);



skip_create_disk:

	memset(&dd->tags, 0, sizeof(dd->tags));

	dd->tags.ops = &mtip_mq_ops;

	dd->tags.nr_hw_queues = 1;
@@ -3916,6 +3913,7 @@ skip_create_disk: 
	dd->disk->queue		= dd->queue;

	dd->queue->queuedata	= dd;



skip_create_disk:

	/* Initialize the protocol layer. */

	wait_for_rebuild = mtip_hw_get_identify(dd);

	if (wait_for_rebuild < 0) {
@@ -4077,6 +4075,7 @@ static int mtip_block_remove(struct driver_data *dd) 
		dd->bdev = NULL;

	}

	if (dd->disk) {

		if (test_bit(MTIP_DDF_INIT_DONE_BIT, &dd->dd_flag))

			del_gendisk(dd->disk);

		if (dd->disk->queue) {

			blk_cleanup_queue(dd->queue);
@@ -4118,6 +4117,7 @@ static int mtip_block_shutdown(struct driver_data *dd) 
		dev_info(&dd->pdev->dev,

			"Shutting down %s ...\n", dd->disk->disk_name);



		if (test_bit(MTIP_DDF_INIT_DONE_BIT, &dd->dd_flag))

			del_gendisk(dd->disk);

		if (dd->disk->queue) {

			blk_cleanup_queue(dd->queue);