diff options
| author | Max Gurtovoy <maxg@mellanox.com> | 2018-04-12 09:16:12 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-04-12 09:58:27 -0600 |
| commit | fd92c77f58257ae5eb5180afe36e86094e4910f6 (patch) | |
| tree | b9e34251ffc071b54c7d6407694bf396863c302f | |
| parent | 543c09c89fdc007c2990aa9d2abcc62e0dfa1311 (diff) | |
| download | linux-stable-fd92c77f58257ae5eb5180afe36e86094e4910f6.tar.gz linux-stable-fd92c77f58257ae5eb5180afe36e86094e4910f6.tar.bz2 linux-stable-fd92c77f58257ae5eb5180afe36e86094e4910f6.zip | |
nvme: check return value of init_srcu_struct function
Also add error flow in case srcu initialization function fails.
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/nvme/host/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 695e52ae22fd..b09940c556d0 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2832,7 +2832,9 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl, goto out_free_head; head->instance = ret; INIT_LIST_HEAD(&head->list); - init_srcu_struct(&head->srcu); + ret = init_srcu_struct(&head->srcu); + if (ret) + goto out_ida_remove; head->subsys = ctrl->subsys; head->ns_id = nsid; kref_init(&head->ref); @@ -2854,6 +2856,7 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl, return head; out_cleanup_srcu: cleanup_srcu_struct(&head->srcu); +out_ida_remove: ida_simple_remove(&ctrl->subsys->ns_ida, head->instance); out_free_head: kfree(head); |