Commit 6731753e authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Li Nan
Browse files

nvme: add error handling support for add_disk() 

mainline inclusion
from mainline-v5.15-rc1
commit ab3994f6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I81XCK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ab3994f6efba95e0832dc9e68c088b2d7ae764b8



----------------------------------------

We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent 91512027

drivers/nvme/host/core.c

+7 −1
Original line number Diff line number Diff line
@@ -3947,7 +3947,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
	up_write(&ctrl->namespaces_rwsem);

	nvme_get_ctrl(ctrl);



	device_add_disk(ctrl->device, ns->disk, nvme_ns_id_attr_groups);

	if (device_add_disk_safe(ctrl->device, ns->disk, nvme_ns_id_attr_groups))

		goto out_cleanup_ns_from_list;



	nvme_mpath_add_disk(ns, id);

	nvme_fault_inject_init(&ns->fault_inject, ns->disk->disk_name);
@@ -3955,6 +3956,11 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 


	return;



 out_cleanup_ns_from_list:

	nvme_put_ctrl(ctrl);

	down_write(&ctrl->namespaces_rwsem);

	list_del_init(&ns->list);

	up_write(&ctrl->namespaces_rwsem);

 out_unlink_ns:

	mutex_lock(&ctrl->subsys->lock);

	list_del_rcu(&ns->siblings);