Commit a11b4743 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Remove unnecessary eh_bus_reset_handler callback 



The callback function used by zfcp always returns success,
which is an indication for the SCSI midlayer to stop error
handling. Remove the bus_reset callback, since the same
function will be called via the host_reset callback.

Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent f858317d

drivers/s390/scsi/zfcp_scsi.c

+2 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ struct zfcp_data zfcp_data = { 
		.queuecommand		= zfcp_scsi_queuecommand,

		.eh_abort_handler	= zfcp_scsi_eh_abort_handler,

		.eh_device_reset_handler = zfcp_scsi_eh_device_reset_handler,

		.eh_bus_reset_handler	= zfcp_scsi_eh_host_reset_handler,

		.eh_host_reset_handler	= zfcp_scsi_eh_host_reset_handler,

		.can_queue		= 4096,

		.this_id		= -1,
@@ -542,7 +541,7 @@ zfcp_task_management_function(struct zfcp_unit *unit, u8 tm_flags, 
}



/**

 * zfcp_scsi_eh_host_reset_handler - handler for host and bus reset

 * zfcp_scsi_eh_host_reset_handler - handler for host reset

 */

static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)

{
@@ -552,7 +551,7 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt) 
	unit = (struct zfcp_unit*) scpnt->device->hostdata;

	adapter = unit->port->adapter;



	ZFCP_LOG_NORMAL("host/bus reset because of problems with "

	ZFCP_LOG_NORMAL("host reset because of problems with "

			"unit 0x%016Lx\n", unit->fcp_lun);



	zfcp_erp_adapter_reopen(adapter, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE