forked from luck/tmp_suning_uos_patched
nvme: properly propagate errors in nvme_mpath_init
Signed-off-by: Susobhan Dey <susobhan.dey@gmail.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
be1277f5eb
commit
bb830add19
|
@ -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);
|
INIT_WORK(&ctrl->ana_work, nvme_ana_work);
|
||||||
ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL);
|
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;
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
error = nvme_read_ana_log(ctrl, true);
|
error = nvme_read_ana_log(ctrl, true);
|
||||||
if (error)
|
if (error)
|
||||||
|
@ -547,7 +549,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
|
||||||
out_free_ana_log_buf:
|
out_free_ana_log_buf:
|
||||||
kfree(ctrl->ana_log_buf);
|
kfree(ctrl->ana_log_buf);
|
||||||
out:
|
out:
|
||||||
return -ENOMEM;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
void nvme_mpath_uninit(struct nvme_ctrl *ctrl)
|
void nvme_mpath_uninit(struct nvme_ctrl *ctrl)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user