Commit a0e86d95 authored by Steffen Maier's avatar Steffen Maier Committed by Martin K. Petersen
Browse files

scsi: zfcp: move scsi_eh & non-ERP timeout defines owned by and local to zfcp_fsf.c 



Also clarify namespace prefix for the timeout used for FSF requests on
behalf of SCSI error recovery: It is zfcp_fsf_ not zfcp_scsi_.

Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c24635ac

drivers/s390/scsi/zfcp_def.h

+0 −6
Original line number Diff line number Diff line
@@ -41,17 +41,11 @@ 
#include "zfcp_fc.h"

#include "zfcp_qdio.h"



/********************* SCSI SPECIFIC DEFINES *********************************/

#define ZFCP_SCSI_ER_TIMEOUT                    (10*HZ)



/********************* FSF SPECIFIC DEFINES *********************************/



/* ATTENTION: value must not be used by hardware */

#define FSF_QTCB_UNSOLICITED_STATUS		0x6305



/* timeout value for "default timer" for fsf requests */

#define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ)



/*************** ADAPTER/PORT/UNIT AND FSF_REQ STATUS FLAGS ******************/



/*

drivers/s390/scsi/zfcp_fsf.c

+7 −2
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 
#include "zfcp_qdio.h"

#include "zfcp_reqlist.h"



/* timeout for FSF requests sent during scsi_eh: abort or FCP TMF */

#define ZFCP_FSF_SCSI_ER_TIMEOUT (10*HZ)

/* timeout for: exchange config/port data outside ERP, or open/close WKA port */

#define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ)



struct kmem_cache *zfcp_fsf_qtcb_cache;



static void zfcp_fsf_request_timeout_handler(struct timer_list *t)
@@ -912,7 +917,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_cmnd(struct scsi_cmnd *scmnd) 
	req->qtcb->header.port_handle = zfcp_sdev->port->handle;

	req->qtcb->bottom.support.req_handle = (u64) old_req_id;



	zfcp_fsf_start_timer(req, ZFCP_SCSI_ER_TIMEOUT);

	zfcp_fsf_start_timer(req, ZFCP_FSF_SCSI_ER_TIMEOUT);

	if (!zfcp_fsf_req_send(req))

		goto out;
@@ -2369,7 +2374,7 @@ struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_device *sdev, 
	fcp_cmnd = &req->qtcb->bottom.io.fcp_cmnd.iu;

	zfcp_fc_fcp_tm(fcp_cmnd, sdev, tm_flags);



	zfcp_fsf_start_timer(req, ZFCP_SCSI_ER_TIMEOUT);

	zfcp_fsf_start_timer(req, ZFCP_FSF_SCSI_ER_TIMEOUT);

	if (!zfcp_fsf_req_send(req))

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE