The GENHD_FL_DISK_ADDED flag is what we really want, as the
flag GENHD_FL_UP could be set on a semi-initialized device.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
  drivers/nvme/host/core.c      | 4 ++--
  drivers/nvme/host/multipath.c | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 11779be42186..3848353fba11 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c

@@ -1819,7 +1819,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
  static inline bool nvme_first_scan(struct gendisk *disk)
  {
  	/* nvme_alloc_ns() scans the disk prior to adding it */
-	return !(disk->flags & GENHD_FL_UP);
+	return !(disk->flags & GENHD_FL_DISK_ADDED);
  }
  
  static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id)

@@ -3823,7 +3823,7 @@ static void nvme_ns_remove(struct nvme_ns *ns)
  	nvme_mpath_clear_current_path(ns);
  	synchronize_srcu(&ns->head->srcu); /* wait for concurrent submissions */
  
-	if (ns->disk->flags & GENHD_FL_UP) {
+	if (ns->disk->flags & GENHD_FL_DISK_ADDED) {
  		if (!nvme_ns_head_multipath(ns->head))
  			nvme_cdev_del(&ns->cdev, &ns->cdev_device);
  		del_gendisk(ns->disk);

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 0ea5298469c3..8048678969ba 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c

@@ -764,7 +764,7 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head)
  {
  	if (!head->disk)
  		return;
-	if (head->disk->flags & GENHD_FL_UP) {
+	if (head->disk->flags & GENHD_FL_DISK_ADDED) {
  		nvme_cdev_del(&head->cdev, &head->cdev_device);
  		del_gendisk(head->disk);
  	}