nvme: fix namespace removal list

This function wants to move a subset of a list from one element to the
tail into another list. It also needs to use the srcu synchronize
instead of the regular rcu version. Do this one element at a time
because that's the only to do it.

Fixes: be647e2c76b27f4 ("nvme: use srcu for iterating namespace list")
Reported-by: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
Tested-by: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c40930d10bd34d0d43eb3991727269ad136d2a82..782090ce0bc10d1b81a7846976ddfe7d41441356 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3960,12 +3960,13 @@ static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
 
        mutex_lock(&ctrl->namespaces_lock);
        list_for_each_entry_safe(ns, next, &ctrl->namespaces, list) {
-               if (ns->head->ns_id > nsid)
-                       list_splice_init_rcu(&ns->list, &rm_list,
-                                            synchronize_rcu);
+               if (ns->head->ns_id > nsid) {
+                       list_del_rcu(&ns->list);
+                       synchronize_srcu(&ctrl->srcu);
+                       list_add_tail_rcu(&ns->list, &rm_list);
+               }
        }
        mutex_unlock(&ctrl->namespaces_lock);
-       synchronize_srcu(&ctrl->srcu);
 
        list_for_each_entry_safe(ns, next, &rm_list, list)
                nvme_ns_remove(ns);