* [PATCH 1/1] nvme: check return value of init_srcu_struct function
@ 2018-04-02 12:46 Max Gurtovoy
2018-04-03 9:18 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Max Gurtovoy @ 2018-04-02 12:46 UTC (permalink / raw)
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(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 666e509..38b450e 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -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);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/1] nvme: check return value of init_srcu_struct function
2018-04-02 12:46 [PATCH 1/1] nvme: check return value of init_srcu_struct function Max Gurtovoy
@ 2018-04-03 9:18 ` Christoph Hellwig
2018-04-03 21:11 ` Keith Busch
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2018-04-03 9:18 UTC (permalink / raw)
Looks good,
Reviewed-by: Christoph Hellwig <hch at lst.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] nvme: check return value of init_srcu_struct function
2018-04-03 9:18 ` Christoph Hellwig
@ 2018-04-03 21:11 ` Keith Busch
0 siblings, 0 replies; 3+ messages in thread
From: Keith Busch @ 2018-04-03 21:11 UTC (permalink / raw)
Applied, thanks for the fix!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-03 21:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-02 12:46 [PATCH 1/1] nvme: check return value of init_srcu_struct function Max Gurtovoy
2018-04-03 9:18 ` Christoph Hellwig
2018-04-03 21:11 ` Keith Busch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox