zfcp: introduce struct timer_list in struct zfcp_fsf_req
Subsystems (3)
PATCH 4/6 zfcp: introduce struct timer_list in struct zfcp_fsf_req
zfcp: introduce struct timer_list in struct zfcp_fsf_req
This instance will be used whenever a timer is needed for a request by zfcp.
Signed-off-by Andreas Herrmann <[email protected]>
--- drivers/s390/scsi/zfcp_aux.c | 4 - drivers/s390/scsi/zfcp_def.h | 8 - drivers/s390/scsi/zfcp_erp.c | 228 +++++++++++------------------------- drivers/s390/scsi/zfcp_ext.h | 13 +- drivers/s390/scsi/zfcp_fsf.c | 257 +++++++++++++++++------------------------ drivers/s390/scsi/zfcp_scsi.c | 25 +--- 6 files changed, 191 insertions(+), 344 deletions(-)
drivers/s390/scsi/zfcp_aux.c +0 -4
@@ -1135,9 +1135,6 @@ zfcp_adapter_enqueue(struct ccw_device */* initialize lock of associated request queue */ rwlock_init (&adapter->request_queue.queue_lock); -/* intitialise SCSI ER timer */ -init_timer (&adapter->scsi_er_timer); -/* mark adapter unusable as long as sysfs registration is not complete */ atomic_set_mask (ZFCP_STATUS_COMMON_REMOVE , &adapter->status);
@@ -1653,7 +1650,6 @@ zfcp_ns_gid_pn_request(struct zfcp_erp_a gid_pn->ct.handler = zfcp_ns_gid_pn_handler; gid_pn->ct.handler_data = (unsigned long ) gid_pn; gid_pn->ct.timeout =ZFCP_NS_GID_PN_TIMEOUT ; - gid_pn->ct.timer = &erp_action->timer; gid_pn->port = erp_action->port; ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.fsf_req_erp,
drivers/s390/scsi/zfcp_def.h +2 -6
@@ -137,7 +137,7 @@ #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_#define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES 7/* timeout value for "default timer" for fsf requests */ -#define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ); +#define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ)/*************** FIBRE CHANNEL PROTOCOL SPECIFIC DEFINES ********************/
@@ -779,7 +779,6 @@ typedef void (*zfcp_send_ct_handler_t)(u* @handler_data: data passed to handler function * @pool: pointer to memory pool for ct request structure * @timeout: FSF timeout for this request -* @timer: timer (e.g. for request initiated by erp) * @completion: completion for synchronization purposes * @status: used to pass error status to calling function */
@@ -793,7 +792,6 @@ struct zfcp_send_ct {unsigned long handler_data;mempool_t *pool;int timeout; -struct timer_list *timer;struct completion *completion;int status; };
@@ -821,7 +819,6 @@ typedef void (*zfcp_send_els_handler_t)(* @resp_count: number of elements in response scatter-gather list * @handler: handler function (called for response to the request) * @handler_data: data passed to handler function -* @timer: timer (e.g. for request initiated by erp) * @completion: completion for synchronization purposes * @ls_code: hex code of ELS command * @status: used to pass error status to calling function
@@ -836,7 +833,6 @@ struct zfcp_send_els {unsigned int resp_count;zfcp_send_els_handler_t handler;unsigned long handler_data; -struct timer_list *timer;struct completion *completion;int ls_code;int status;
@@ -886,7 +882,6 @@ struct zfcp_adapter {struct list_head port_remove_lh;/* head of ports to be removed */ u32 ports;/* number of remote ports */ -struct timer_list scsi_er_timer;/* SCSI err recovery watch */ atomic_t reqs_active;/* # active FSF reqs */ unsigned long req_no;/* unique FSF req number */ struct list_head *req_list;/* list of pending reqs */
@@ -1003,6 +998,7 @@ struct zfcp_fsf_req {struct fsf_qtcb *qtcb;/* address of associated QTCB */ u32 seq_no;/* Sequence number of request */ unsigned long data;/* private data of request */ +struct timer_list timer;/* used for erp or scsi er */ struct zfcp_erp_action *erp_action;/* used if this request is issued on behalf of erp */ mempool_t *pool;/* used if request was alloacted
drivers/s390/scsi/zfcp_erp.c +72 -156
376 lines not on this page · raw message
drivers/s390/scsi/zfcp_ext.h +5 -8
@@ -87,8 +87,8 @@ extern int zfcp_fsf_exchange_port_data( struct fsf_qtcb_bottom_port *);extern int zfcp_fsf_control_file (struct zfcp_adapter *,struct zfcp_fsf_req **,u32 ,u32 ,struct zfcp_sg_list *); -extern void zfcp_fsf_request_timeout_handler (unsigned long ); -extern void zfcp_fsf_scsi_er_timeout_handler (unsigned long ); +extern void zfcp_fsf_start_timer (struct zfcp_fsf_req *,unsigned long ); +extern void zfcp_erp_start_timer (struct zfcp_fsf_req *);extern int zfcp_fsf_req_dismiss_all (struct zfcp_adapter *);extern int zfcp_fsf_status_read (struct zfcp_adapter *,int ); extern int zfcp_fsf_req_create(struct zfcp_adapter *, u32, int, mempool_t *,
@@ -98,8 +98,7 @@ extern int zfcp_fsf_send_ct(struct zfcp_extern int zfcp_fsf_send_els (struct zfcp_send_els *);extern int zfcp_fsf_send_fcp_command_task (struct zfcp_adapter *,struct zfcp_unit *, -struct scsi_cmnd *, -struct timer_list *,int ); +struct scsi_cmnd *,int ,int );extern int zfcp_fsf_req_complete (struct zfcp_fsf_req *);extern void zfcp_fsf_incoming_els (struct zfcp_fsf_req *);extern void zfcp_fsf_req_free (struct zfcp_fsf_req *);
@@ -123,13 +122,11 @@ extern char *zfcp_get_fcp_rsp_info_ptr(sextern void set_host_byte (u32 *,char );extern void set_driver_byte (u32 *,char );extern char *zfcp_get_fcp_sns_info_ptr (struct fcp_rsp_iu *); -extern void zfcp_fsf_start_scsi_er_timer (struct zfcp_adapter *);extern fcp_dl_t zfcp_get_fcp_dl (struct fcp_cmnd_iu *);extern int zfcp_scsi_command_async (struct zfcp_adapter *,struct zfcp_unit *, -struct scsi_cmnd *,struct timer_list *); -extern int zfcp_scsi_command_sync (struct zfcp_unit *,struct scsi_cmnd *, -struct timer_list *); +struct scsi_cmnd *,int ); +extern int zfcp_scsi_command_sync (struct zfcp_unit *,struct scsi_cmnd *,int );extern struct fc_function_template zfcp_transport_functions;/******************************** ERP ****************************************/
drivers/s390/scsi/zfcp_fsf.c +105 -152
595 lines not on this page · raw message
drivers/s390/scsi/zfcp_scsi.c +7 -18
@@ -231,7 +231,7 @@ zfcp_scsi_command_fail(struct scsi_cmnd*/ int zfcp_scsi_command_async (struct zfcp_adapter *adapter,struct zfcp_unit *unit, -struct scsi_cmnd *scpnt,struct timer_list *timer) +struct scsi_cmnd *scpnt,int use_timer) {int tmp;int retval;
@@ -267,7 +267,7 @@ zfcp_scsi_command_async(struct zfcp_adap goto out; } - tmp =zfcp_fsf_send_fcp_command_task (adapter, unit, scpnt, timer, + tmp =zfcp_fsf_send_fcp_command_task (adapter, unit, scpnt, use_timer,ZFCP_REQ_AUTO_CLEANUP );if (unlikely (tmp <0 )) {
@@ -291,21 +291,22 @@ zfcp_scsi_command_sync_handler(struct sc* zfcp_scsi_command_sync - send a SCSI command and wait for completion * @unit: unit where command is sent to * @scpnt: scsi command to be sent -* @timer: timer to be started if request is successfully initiated +* @use_timer: indicates whether timer should be setup or not * Return: 0 * * Errors are indicated in scpnt->result */ int zfcp_scsi_command_sync (struct zfcp_unit *unit,struct scsi_cmnd *scpnt, -struct timer_list *timer) +int use_timer) {int ret;DECLARE_COMPLETION (wait); scpnt->SCp.ptr = (void *) &wait;/* silent re-use */ scpnt->scsi_done = zfcp_scsi_command_sync_handler; - ret =zfcp_scsi_command_async (unit->port->adapter, unit, scpnt, timer); + ret =zfcp_scsi_command_async (unit->port->adapter, unit, scpnt, + use_timer);if (ret ==0 )wait_for_completion (&wait);
@@ -341,7 +342,7 @@ zfcp_scsi_queuecommand(struct scsi_cmnd adapter = (struct zfcp_adapter *) scpnt->device->host->hostdata[0 ]; unit = (struct zfcp_unit *) scpnt->device->hostdata; -return zfcp_scsi_command_async (adapter, unit, scpnt,NULL ); +return zfcp_scsi_command_async (adapter, unit, scpnt,0 ); } static struct zfcp_unit *
@@ -538,8 +539,6 @@ zfcp_task_management_function(struct zfc/** * zfcp_scsi_eh_host_reset_handler - handler for host and bus reset -* -* If ERP is already running it will be stopped. */ int zfcp_scsi_eh_host_reset_handler (struct scsi_cmnd *scpnt) {
@@ -638,16 +637,6 @@ zfcp_adapter_scsi_unregister(struct zfcpreturn ; } - -void -zfcp_fsf_start_scsi_er_timer (struct zfcp_adapter *adapter) -{ - adapter->scsi_er_timer.function = zfcp_fsf_scsi_er_timeout_handler; - adapter->scsi_er_timer.data = (unsigned long ) adapter; - adapter->scsi_er_timer.expires = jiffies +ZFCP_SCSI_ER_TIMEOUT ; -add_timer (&adapter->scsi_er_timer); -} -/* * Support functions for FC transport class */
Signature · 1 line
1.4.2.1.g80823