From: Christoph Hellwig <hch@lst.de>
Date: Mon, 9 Aug 2021 06:40:25 +0000 (+0200)
Subject: sx8: use the internal state machine to check if del_gendisk needs to be called
X-Git-Tag: v5.15~460^2~69
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4f9e14aecfbdc6b762d5122489604858c5fec5e7;p=mirror_ubuntu-kernels.git

sx8: use the internal state machine to check if del_gendisk needs to be called

Remove usage of the block layer internal GENHD_FL_UP by just looking
at the host state.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210809064028.1198327-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 7b54353ee92b..420cd952ddc4 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1373,7 +1373,7 @@ static void carm_free_disk(struct carm_host *host, unsigned int port_no)
 	if (!disk)
 		return;
 
-	if (disk->flags & GENHD_FL_UP)
+	if (host->state > HST_DEV_ACTIVATE)
 		del_gendisk(disk);
 	blk_cleanup_disk(disk);
 }