Commit ff0ffe5b authored by Keith Busch's avatar Keith Busch
Browse files

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: be647e2c ("nvme: use srcu for iterating namespace list")
Reported-by: default avatarVenkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
Tested-by: default avatarVenkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent cd0c1b8e

drivers/nvme/host/core.c

+5 −4
Original line number Diff line number Diff line
@@ -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);