Merge branch 'nvme-4.19' of git://git.infradead.org/nvme into for-linus

axboe · axboe · commit 7a7080b53467 · 2018-10-17T09:45:49.000-06:00
Pull single NVMe fix from Christoph.

* 'nvme-4.19' of git://git.infradead.org/nvme:
  nvme: remove ns sibling before clearing path
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -3143,8 +3143,8 @@ static void nvme_ns_remove(struct nvme_ns *ns)
 	}
 
 	mutex_lock(&ns->ctrl->subsys->lock);
-	nvme_mpath_clear_current_path(ns);
 	list_del_rcu(&ns->siblings);
+	nvme_mpath_clear_current_path(ns);
 	mutex_unlock(&ns->ctrl->subsys->lock);
 
 	down_write(&ns->ctrl->namespaces_rwsem);

Original file line number	Diff line number	Diff line change
`@@ -3143,8 +3143,8 @@ static void nvme_ns_remove(struct nvme_ns *ns)`
`3143`	`3143`	`}`
`3144`	`3144`
`3145`	`3145`	`mutex_lock(&ns->ctrl->subsys->lock);`
`3146`		`- nvme_mpath_clear_current_path(ns);`
`3147`	`3146`	`list_del_rcu(&ns->siblings);`
	`3147`	`+ nvme_mpath_clear_current_path(ns);`
`3148`	`3148`	`mutex_unlock(&ns->ctrl->subsys->lock);`
`3149`	`3149`
`3150`	`3150`	`down_write(&ns->ctrl->namespaces_rwsem);`