[SCSI] zfcp: Simplify and update ct/gs and els timeout handling

The recommendation for a timeout of 2 * R_A_TOV is the same for ct/gs
and els requests, so set it in the common function used for
initializing both request types. Besides, the timer inside zfcp should
only run longer than the timeout set for the channel, so 10 seconds
more should be enough (instead of 60 seconds).

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

3 files changed, 6 insertions, 17 deletions

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index ce65d88e280c..99830758e873 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -73,9 +73,6 @@
 
 /*************** FIBRE CHANNEL PROTOCOL SPECIFIC DEFINES ********************/
 
-/* timeout for name-server lookup (in seconds) */
-#define ZFCP_NS_GID_PN_TIMEOUT          10
-
 /* task attribute values in FCP-2 FCP_CMND IU */
 #define SIMPLE_Q        0
 #define HEAD_OF_Q       1
@@ -319,7 +316,6 @@ struct ct_iu_gpn_ft_req {
  * @resp: scatter-gather list for response
  * @handler: handler function (called for response to the request)
  * @handler_data: data passed to handler function
- * @timeout: FSF timeout for this request
  * @completion: completion for synchronization purposes
  * @status: used to pass error status to calling function
  */
@@ -329,7 +325,6 @@ struct zfcp_send_ct {
         struct scatterlist *resp;
         void (*handler)(unsigned long);
         unsigned long handler_data;
-        int timeout;
         struct completion *completion;
         int status;
 };
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index 5c1f12247e42..82f148d09968 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -283,7 +283,6 @@ static int zfcp_fc_ns_gid_pn_request(struct zfcp_port *port,
         gid_pn->ct.wka_port = &adapter->gs->ds;
         gid_pn->ct.handler = zfcp_fc_ns_handler;
         gid_pn->ct.handler_data = (unsigned long) &compl_rec;
-        gid_pn->ct.timeout = ZFCP_NS_GID_PN_TIMEOUT;
         gid_pn->ct.req = &gid_pn->req;
         gid_pn->ct.resp = &gid_pn->resp;
         sg_init_one(&gid_pn->req, &gid_pn->ct_iu_req,
@@ -556,7 +555,6 @@ static int zfcp_fc_send_gpn_ft(struct zfcp_gpn_ft *gpn_ft,
         ct->wka_port = &adapter->gs->ds;
         ct->handler = zfcp_fc_ns_handler;
         ct->handler_data = (unsigned long)&compl_rec;
-        ct->timeout = 10;
         ct->req = &gpn_ft->sg_req;
         ct->resp = gpn_ft->sg_resp;
 
@@ -845,7 +843,6 @@ int zfcp_fc_execute_ct_fc_job(struct fc_bsg_job *job)
 
         ct_fc_job->ct.req = job->request_payload.sg_list;
         ct_fc_job->ct.resp = job->reply_payload.sg_list;
-        ct_fc_job->ct.timeout = ZFCP_FSF_REQUEST_TIMEOUT;
         ct_fc_job->ct.handler = zfcp_fc_generic_ct_handler;
         ct_fc_job->ct.handler_data = (unsigned long) ct_fc_job;
         ct_fc_job->ct.completion = NULL;
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index c241f032fd49..f09c863dc6bd 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1060,7 +1060,12 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,
                                         sg_resp, max_sbals);
         if (bytes <= 0)
                 return -EIO;
+
+        /* common settings for ct/gs and els requests */
         req->qtcb->bottom.support.resp_buf_length = bytes;
+        req->qtcb->bottom.support.service_class = FSF_CLASS_3;
+        req->qtcb->bottom.support.timeout = 2 * R_A_TOV;
+        zfcp_fsf_start_timer(req, 2 * R_A_TOV + 10);
 
         return 0;
 }
@@ -1096,12 +1101,9 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool)
 
         req->handler = zfcp_fsf_send_ct_handler;
         req->qtcb->header.port_handle = wka_port->handle;
-        req->qtcb->bottom.support.service_class = FSF_CLASS_3;
-        req->qtcb->bottom.support.timeout = ct->timeout;
         req->data = ct;
 
         zfcp_dbf_san_ct_request(req);
-        zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
 
         ret = zfcp_fsf_req_send(req);
         if (ret)
@@ -1176,7 +1178,6 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
 {
         struct zfcp_fsf_req *req;
         struct zfcp_qdio *qdio = els->adapter->qdio;
-        struct fsf_qtcb_bottom_support *bottom;
         int ret = -EIO;
 
         spin_lock_bh(&qdio->req_q_lock);
@@ -1196,16 +1197,12 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
         if (ret)
                 goto failed_send;
 
-        bottom = &req->qtcb->bottom.support;
+        req->qtcb->bottom.support.d_id = els->d_id;
         req->handler = zfcp_fsf_send_els_handler;
-        bottom->d_id = els->d_id;
-        bottom->service_class = FSF_CLASS_3;
-        bottom->timeout = 2 * R_A_TOV;
         req->data = els;
 
         zfcp_dbf_san_els_request(req);
 
-        zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         ret = zfcp_fsf_req_send(req);
         if (ret)
                 goto failed_send;