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

Commit b6a05c82 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: remove eh_timed_out methods in the transport template 



Instead define the timeout behavior purely based on the host_template
eh_timed_out method and wire up the existing transport implementations
in the host templates.  This also clears up the confusion that the
transport template method overrides the host template one, so some
drivers have to re-override the transport template one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarTyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 28917d40

drivers/ata/libata-eh.c

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd) 
	DPRINTK("EXIT, ret=%d\n", ret);

	return ret;

}

EXPORT_SYMBOL(ata_scsi_timed_out);



static void ata_eh_unload(struct ata_port *ap)

{

drivers/ata/libata-transport.c

+0 −1
Original line number Diff line number Diff line
@@ -716,7 +716,6 @@ struct scsi_transport_template *ata_attach_transport(void) 
		return NULL;



	i->t.eh_strategy_handler	= ata_scsi_error;

	i->t.eh_timed_out		= ata_scsi_timed_out;

	i->t.user_scan			= ata_scsi_user_scan;



	i->t.host_attrs.ac.attrs = &i->port_attrs[0];

drivers/ata/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ extern unsigned long ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd); 
extern void ata_internal_cmd_timed_out(struct ata_device *dev, u8 cmd);

extern void ata_eh_acquire(struct ata_port *ap);

extern void ata_eh_release(struct ata_port *ap);

extern enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);

extern void ata_scsi_error(struct Scsi_Host *host);

extern void ata_eh_fastdrain_timerfn(unsigned long arg);

extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −0
Original line number Diff line number Diff line
@@ -997,6 +997,7 @@ static struct scsi_host_template iscsi_iser_sht = { 
	.change_queue_depth	= scsi_change_queue_depth,

	.sg_tablesize           = ISCSI_ISER_DEF_SG_TABLESIZE,

	.cmd_per_lun            = ISER_DEF_CMD_PER_LUN,

	.eh_timed_out		= iscsi_eh_cmd_timed_out,

	.eh_abort_handler       = iscsi_eh_abort,

	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_target_reset_handler = iscsi_eh_recover_target,

drivers/infiniband/ulp/srp/ib_srp.c

+1 −0
Original line number Diff line number Diff line
@@ -2864,6 +2864,7 @@ static struct scsi_host_template srp_template = { 
	.info				= srp_target_info,

	.queuecommand			= srp_queuecommand,

	.change_queue_depth             = srp_change_queue_depth,

	.eh_timed_out			= srp_timed_out,

	.eh_abort_handler		= srp_abort,

	.eh_device_reset_handler	= srp_reset_device,

	.eh_host_reset_handler		= srp_reset_host,