Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 460add31 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Sasha Levin
Browse files

scsi: core: Avoid printing an error if target_alloc() returns -ENXIO 

[ Upstream commit 70edd2e6f652f67d854981fd67f9ad0f1deaea92 ]

Avoid printing a 'target allocation failed' error if the driver
target_alloc() callback function returns -ENXIO. This return value
indicates that the corresponding H:C:T:L entry is empty.

Removing this error reduces the scan time if the user issues SCAN_WILD_CARD
scan operation through sysfs parameter on a host with a lot of empty
H:C:T:L entries.

Avoiding the printk on -ENXIO matches the behavior of the other callback
functions during scanning.

Link: https://lore.kernel.org/r/20210726115402.1936-1-sreekanth.reddy@broadcom.com


Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e25e7495

drivers/scsi/scsi_scan.c

+2 −1
Original line number Diff line number Diff line
@@ -462,7 +462,8 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, 
		error = shost->hostt->target_alloc(starget);



		if(error) {

			dev_printk(KERN_ERR, dev, "target allocation failed, error %d\n", error);

			if (error != -ENXIO)

				dev_err(dev, "target allocation failed, error %d\n", error);

			/* don't want scsi_target_reap to do the final

			 * put because it will be under the host lock */

			scsi_target_destroy(starget);