* [PATCH] NVMe wrong return value if read log fails
@ 2018-09-25 19:29 Susobhan Dey
2018-09-25 23:22 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Susobhan Dey @ 2018-09-25 19:29 UTC (permalink / raw)
Signed-off-by: Susobhan Dey <susobhan.dey at gmail.com>
---
drivers/nvme/host/multipath.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 5a9562881d4e..9fe3fff818b8 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -537,8 +537,10 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
INIT_WORK(&ctrl->ana_work, nvme_ana_work);
ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL);
- if (!ctrl->ana_log_buf)
+ if (!ctrl->ana_log_buf) {
+ error = -ENOMEM;
goto out;
+ }
error = nvme_read_ana_log(ctrl, true);
if (error)
@@ -547,7 +549,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
out_free_ana_log_buf:
kfree(ctrl->ana_log_buf);
out:
- return -ENOMEM;
+ return error;
}
void nvme_mpath_uninit(struct nvme_ctrl *ctrl)
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] NVMe wrong return value if read log fails
2018-09-25 19:29 [PATCH] NVMe wrong return value if read log fails Susobhan Dey
@ 2018-09-25 23:22 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2018-09-25 23:22 UTC (permalink / raw)
Thanks,
applied to nvme-4.19.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-25 23:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-25 19:29 [PATCH] NVMe wrong return value if read log fails Susobhan Dey
2018-09-25 23:22 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).