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

Commit 491ca442 authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[SCSI] zfcp: Introduce bsg_timeout callback. 



Introduce a zfcp callback for timeouts triggered from FC BSG.  With
zfcp, the underlying hardware cannot abort CT or ELS requests, so
there is nothing to do when the block layer timeout expires.  To avoid
interference with the block layer timeout, simply indicate that the
block layer timer should be reset. The timer running in the hardware
for the pending CT or ELS request will return the request when it
expires.

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

drivers/s390/scsi/zfcp_ext.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *); 
extern int zfcp_fc_gs_setup(struct zfcp_adapter *);

extern void zfcp_fc_gs_destroy(struct zfcp_adapter *);

extern int zfcp_fc_exec_bsg_job(struct fc_bsg_job *);

extern int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *);



/* zfcp_fsf.c */

extern int zfcp_fsf_open_port(struct zfcp_erp_action *);

drivers/s390/scsi/zfcp_fc.c

+6 −0
Original line number Diff line number Diff line
@@ -788,6 +788,12 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job) 
	}

}



int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *job)

{

	/* hardware tracks timeout, reset bsg timeout to not interfere */

	return -EAGAIN;

}



int zfcp_fc_gs_setup(struct zfcp_adapter *adapter)

{

	struct zfcp_fc_wka_ports *wka_ports;

drivers/s390/scsi/zfcp_scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ struct fc_function_template zfcp_transport_functions = { 
	.show_host_port_state = 1,

	.show_host_active_fc4s = 1,

	.bsg_request = zfcp_fc_exec_bsg_job,

	.bsg_timeout = zfcp_fc_timeout_bsg_job,

	/* no functions registered for following dynamic attributes but

	   directly set by LLDD */

	.show_host_port_type = 1,