aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Gurtovoy <maxg@mellanox.com>2018-04-12 11:16:12 -0400
committerJens Axboe <axboe@kernel.dk>2018-04-12 11:58:27 -0400
commitfd92c77f58257ae5eb5180afe36e86094e4910f6 (patch)
treeb9e34251ffc071b54c7d6407694bf396863c302f
parent543c09c89fdc007c2990aa9d2abcc62e0dfa1311 (diff)
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.c5
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,
2832 goto out_free_head; 2832 goto out_free_head;
2833 head->instance = ret; 2833 head->instance = ret;
2834 INIT_LIST_HEAD(&head->list); 2834 INIT_LIST_HEAD(&head->list);
2835 init_srcu_struct(&head->srcu); 2835 ret = init_srcu_struct(&head->srcu);
2836 if (ret)
2837 goto out_ida_remove;
2836 head->subsys = ctrl->subsys; 2838 head->subsys = ctrl->subsys;
2837 head->ns_id = nsid; 2839 head->ns_id = nsid;
2838 kref_init(&head->ref); 2840 kref_init(&head->ref);
@@ -2854,6 +2856,7 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl,
2854 return head; 2856 return head;
2855out_cleanup_srcu: 2857out_cleanup_srcu:
2856 cleanup_srcu_struct(&head->srcu); 2858 cleanup_srcu_struct(&head->srcu);
2859out_ida_remove:
2857 ida_simple_remove(&ctrl->subsys->ns_ida, head->instance); 2860 ida_simple_remove(&ctrl->subsys->ns_ida, head->instance);
2858out_free_head: 2861out_free_head:
2859 kfree(head); 2862 kfree(head);