diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-18 15:50:42 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-18 15:50:42 +0300 |
| commit | b8f3b564937c1f3529bc4897cc41c5d95d2cdbe9 (patch) | |
| tree | b71ed4906bbe2ca96d68dbf1d6d6f0fe2676f1de /drivers/nvme/host/multipath.c | |
| parent | 4e52cb9e2c22c9d860910794c82461064baadd9f (diff) | |
| parent | 519d81956ee277b4419c723adfb154603c2565ba (diff) | |
| download | linux-b8f3b564937c1f3529bc4897cc41c5d95d2cdbe9.tar.xz | |
Merge tag 'v5.15-rc6' into asoc-5.16
Linux 5.15-rc6
Diffstat (limited to 'drivers/nvme/host/multipath.c')
| -rw-r--r-- | drivers/nvme/host/multipath.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 5d7bc58a27bd..fba06618c6c2 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -431,8 +431,6 @@ static int nvme_add_ns_head_cdev(struct nvme_ns_head *head) return ret; ret = nvme_cdev_add(&head->cdev, &head->cdev_device, &nvme_ns_head_chr_fops, THIS_MODULE); - if (ret) - kfree_const(head->cdev_device.kobj.name); return ret; } @@ -600,14 +598,17 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl, down_read(&ctrl->namespaces_rwsem); list_for_each_entry(ns, &ctrl->namespaces, list) { - unsigned nsid = le32_to_cpu(desc->nsids[n]); - + unsigned nsid; +again: + nsid = le32_to_cpu(desc->nsids[n]); if (ns->head->ns_id < nsid) continue; if (ns->head->ns_id == nsid) nvme_update_ns_ana_state(desc, ns); if (++n == nr_nsids) break; + if (ns->head->ns_id > nsid) + goto again; } up_read(&ctrl->namespaces_rwsem); return 0; |