From: Christoph Hellwig <hch@lst.de>
Date: Wed, 17 May 2023 07:53:45 +0000 (+0200)
Subject: nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk
X-Git-Tag: v6.1.37~607
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f481c2af49169d4db27c54350fd8aa007458e3ee;p=platform%2Fkernel%2Flinux-starfive.git

nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk

[ Upstream commit 1743e5f6000901a11f4e1cd741bfa9136f3ec9b1 ]

nvme_mpath_remove_disk is called after del_gendisk, at which point a
blk_mark_disk_dead call doesn't make any sense.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index d09ed00..f96d330 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -858,7 +858,6 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head)
 {
 	if (!head->disk)
 		return;
-	blk_mark_disk_dead(head->disk);
 	/* make sure all pending bios are cleaned up */
 	kblockd_schedule_work(&head->requeue_work);
 	flush_work(&head->requeue_work);