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

Commit cc199e78 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: libsas: move bus_reset_handler() to target_reset_handler() 



The bus reset handler is calling I_T Nexus reset, which logically is a
target reset as it need to specify both the initiator and the target.
So move it to target reset.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e13849b7

drivers/scsi/aic94xx/aic94xx_init.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static struct scsi_host_template aic94xx_sht = { 
	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.use_clustering		= ENABLE_CLUSTERING,

	.eh_device_reset_handler	= sas_eh_device_reset_handler,

	.eh_bus_reset_handler	= sas_eh_bus_reset_handler,

	.eh_target_reset_handler	= sas_eh_target_reset_handler,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

	.track_queue_depth	= 1,

drivers/scsi/hisi_sas/hisi_sas_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1562,7 +1562,7 @@ static struct scsi_host_template _hisi_sas_sht = { 
	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.use_clustering		= ENABLE_CLUSTERING,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

	.eh_bus_reset_handler	= sas_eh_bus_reset_handler,

	.eh_target_reset_handler = sas_eh_target_reset_handler,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

};

drivers/scsi/isci/init.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static struct scsi_host_template isci_sht = { 
	.use_clustering			= ENABLE_CLUSTERING,

	.eh_abort_handler		= sas_eh_abort_handler,

	.eh_device_reset_handler        = sas_eh_device_reset_handler,

	.eh_bus_reset_handler           = sas_eh_bus_reset_handler,

	.eh_target_reset_handler        = sas_eh_target_reset_handler,

	.target_destroy			= sas_target_destroy,

	.ioctl				= sas_ioctl,

	.shost_attrs			= isci_host_attrs,

drivers/scsi/libsas/sas_scsi_host.c

+6 −6
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ int sas_eh_device_reset_handler(struct scsi_cmnd *cmd) 
	return FAILED;

}



int sas_eh_bus_reset_handler(struct scsi_cmnd *cmd)

int sas_eh_target_reset_handler(struct scsi_cmnd *cmd)

{

	int res;

	struct Scsi_Host *host = cmd->device->host;
@@ -554,15 +554,15 @@ static int try_to_reset_cmd_device(struct scsi_cmnd *cmd) 
	struct Scsi_Host *shost = cmd->device->host;



	if (!shost->hostt->eh_device_reset_handler)

		goto try_bus_reset;

		goto try_target_reset;



	res = shost->hostt->eh_device_reset_handler(cmd);

	if (res == SUCCESS)

		return res;



try_bus_reset:

	if (shost->hostt->eh_bus_reset_handler)

		return shost->hostt->eh_bus_reset_handler(cmd);

try_target_reset:

	if (shost->hostt->eh_target_reset_handler)

		return shost->hostt->eh_target_reset_handler(cmd);



	return FAILED;

}
@@ -993,6 +993,6 @@ EXPORT_SYMBOL_GPL(sas_bios_param); 
EXPORT_SYMBOL_GPL(sas_task_abort);

EXPORT_SYMBOL_GPL(sas_phy_reset);

EXPORT_SYMBOL_GPL(sas_eh_device_reset_handler);

EXPORT_SYMBOL_GPL(sas_eh_bus_reset_handler);

EXPORT_SYMBOL_GPL(sas_eh_target_reset_handler);

EXPORT_SYMBOL_GPL(sas_target_destroy);

EXPORT_SYMBOL_GPL(sas_ioctl);

drivers/scsi/mvsas/mv_init.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static struct scsi_host_template mvs_sht = { 
	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.use_clustering		= ENABLE_CLUSTERING,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

	.eh_bus_reset_handler	= sas_eh_bus_reset_handler,

	.eh_target_reset_handler = sas_eh_target_reset_handler,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

	.shost_attrs		= mvst_host_attrs,