Commit 8e4ca649 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by openeuler-sync-bot
Browse files

scsi: sd: Add error handling support for add_disk() 

mainline inclusion
from mainline-v5.16-rc1
commit 2a7a891f
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=2a7a891f4c406822801ecd676b076c64de072c9e

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

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

As with the error handling for device_add() we follow the same logic and
just put the device so that cleanup is done via the scsi_disk_release().

Link: https://lore.kernel.org/r/20211015233028.2167651-2-mcgrof@kernel.org


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
conflict:
  drivers/scsi/sd.c
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
(cherry picked from commit f172bfbe)
parent 96cd06c8

drivers/scsi/sd.c

+7 −1
Original line number Diff line number Diff line
@@ -3498,7 +3498,13 @@ static int sd_probe(struct device *dev) 
		pm_runtime_set_autosuspend_delay(dev,

			sdp->host->hostt->rpm_autosuspend_delay);

	}

	device_add_disk(dev, gd, NULL);



	error = device_add_disk_safe(dev, gd, NULL);

	if (error) {

		put_device(&sdkp->dev);

		goto out;

	}



	blk_delete_region(disk_devt(sdkp->disk), SD_MINORS, sd_default_probe);

	if (sdkp->security) {

		sdkp->opal_dev = init_opal_dev(sdkp, &sd_sec_submit);