Skip to contentSkip to conversation

nvme: check return value of init_srcu_struct function

PATCH New Max Gurtovoy 3 participants 3 messages Apr 2, 2018 – Apr 3, 2018 NVMe

lore
Share & tools
lore

Max Gurtovoy

author
#0 lore raw

PATCH 1/1 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 at mellanox.com>
---
 drivers/nvme/host/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +4 -1
index 666e509..38b450e 100644
@@ -2830,7 +2830,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);

@@ -2852,6 +2854,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);
Signature · 1 line
1.8.3.1
maintainer
#1 lore raw

PATCH 1/1 nvme: check return value of init_srcu_struct function

Looks good,

Reviewed-by Christoph Hellwig <hch at lst.de>
Applied
#2 lore raw

PATCH 1/1 nvme: check return value of init_srcu_struct function

Applied, thanks for the fix!