diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-10-17 09:45:49 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-10-17 09:45:49 -0600 |
| commit | 7a7080b53467ad96c0b371e9d2a2a312f96f99c2 (patch) | |
| tree | 071f901799bb74de0b723b53f5159e4bf2e90fb9 | |
| parent | 5e65a20341e02df637d1c16cd487858d2c6a876a (diff) | |
| parent | 48f78be3326052a7718678ff9a78d6d884a50323 (diff) | |
| download | linux-coc-7a7080b53467ad96c0b371e9d2a2a312f96f99c2.tar.gz | |
Merge branch 'nvme-4.19' of git://git.infradead.org/nvme into for-linus
Pull single NVMe fix from Christoph.
* 'nvme-4.19' of git://git.infradead.org/nvme:
nvme: remove ns sibling before clearing path
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index dd8ec1dd92190..6bb9908bf46f1 100644 --- 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); |