2 files changed, 13 insertions, 14 deletions

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f431c32774f3..6088ea13a6bf 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2835,7 +2835,7 @@ out:
 }
 
 static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid,
-                struct nvme_id_ns *id, bool *new)
+                struct nvme_id_ns *id)
 {
         struct nvme_ctrl *ctrl = ns->ctrl;
         bool is_shared = id->nmic & (1 << 0);
@@ -2851,8 +2851,6 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid,
                         ret = PTR_ERR(head);
                         goto out_unlock;
                 }
-
-                *new = true;
         } else {
                 struct nvme_ns_ids ids;
 
@@ -2864,8 +2862,6 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid,
                         ret = -EINVAL;
                         goto out_unlock;
                 }
-
-                *new = false;
         }
 
         list_add_tail(&ns->siblings, &head->list);
@@ -2936,7 +2932,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
         struct nvme_id_ns *id;
         char disk_name[DISK_NAME_LEN];
         int node = dev_to_node(ctrl->dev), flags = GENHD_FL_EXT_DEVT;
-        bool new = true;
 
         ns = kzalloc_node(sizeof(*ns), GFP_KERNEL, node);
         if (!ns)
@@ -2962,7 +2957,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
         if (id->ncap == 0)
                 goto out_free_id;
 
-        if (nvme_init_ns_head(ns, nsid, id, &new))
+        if (nvme_init_ns_head(ns, nsid, id))
                 goto out_free_id;
         nvme_setup_streams_ns(ctrl, ns);
         
@@ -3028,8 +3023,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
                 pr_warn("%s: failed to register lightnvm sysfs group for identification\n",
                         ns->disk->disk_name);
 
-        if (new)
-                nvme_mpath_add_disk(ns->head);
+        nvme_mpath_add_disk(ns->head);
         nvme_mpath_add_disk_links(ns);
         return;
  out_unlink_ns:
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 3b211d9e58b8..b7e5c6db4d92 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -198,11 +198,16 @@ void nvme_mpath_add_disk(struct nvme_ns_head *head)
 {
         if (!head->disk)
                 return;
-        device_add_disk(&head->subsys->dev, head->disk);
-        if (sysfs_create_group(&disk_to_dev(head->disk)->kobj,
-                        &nvme_ns_id_attr_group))
-                pr_warn("%s: failed to create sysfs group for identification\n",
-                        head->disk->disk_name);
+
+        mutex_lock(&head->subsys->lock);
+        if (!(head->disk->flags & GENHD_FL_UP)) {
+                device_add_disk(&head->subsys->dev, head->disk);
+                if (sysfs_create_group(&disk_to_dev(head->disk)->kobj,
+                                &nvme_ns_id_attr_group))
+                        pr_warn("%s: failed to create sysfs group for identification\n",
+                                head->disk->disk_name);
+        }
+        mutex_unlock(&head->subsys->lock);
 }
 
 void nvme_mpath_add_disk_links(struct nvme_ns *ns)