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

Commit c61b536c authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Reorder FCP I/O and task management handler functions 



Instead of calling the same handler for both, I/O and task management
commands, use different handlers that call a function for the common
part.

Reviewed-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 44a24cb3

drivers/s390/scsi/zfcp_fsf.c

+72 −75
Original line number Diff line number Diff line
@@ -2080,73 +2080,7 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi) 
			    sizeof(blktrc));

}



static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req)

{

	struct scsi_cmnd *scpnt;

	struct fcp_resp_with_ext *fcp_rsp;

	unsigned long flags;



	read_lock_irqsave(&req->adapter->abort_lock, flags);



	scpnt = req->data;

	if (unlikely(!scpnt)) {

		read_unlock_irqrestore(&req->adapter->abort_lock, flags);

		return;

	}



	if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {

		set_host_byte(scpnt, DID_TRANSPORT_DISRUPTED);

		goto skip_fsfstatus;

	}



	switch (req->qtcb->header.fsf_status) {

	case FSF_INCONSISTENT_PROT_DATA:

	case FSF_INVALID_PROT_PARM:

		set_host_byte(scpnt, DID_ERROR);

		goto skip_fsfstatus;

	case FSF_BLOCK_GUARD_CHECK_FAILURE:

		zfcp_scsi_dif_sense_error(scpnt, 0x1);

		goto skip_fsfstatus;

	case FSF_APP_TAG_CHECK_FAILURE:

		zfcp_scsi_dif_sense_error(scpnt, 0x2);

		goto skip_fsfstatus;

	case FSF_REF_TAG_CHECK_FAILURE:

		zfcp_scsi_dif_sense_error(scpnt, 0x3);

		goto skip_fsfstatus;

	}

	fcp_rsp = (struct fcp_resp_with_ext *) &req->qtcb->bottom.io.fcp_rsp;

	zfcp_fc_eval_fcp_rsp(fcp_rsp, scpnt);



skip_fsfstatus:

	zfcp_fsf_req_trace(req, scpnt);

	zfcp_dbf_scsi_result(req->adapter->dbf, scpnt, req);



	scpnt->host_scribble = NULL;

	(scpnt->scsi_done) (scpnt);

	/*

	 * We must hold this lock until scsi_done has been called.

	 * Otherwise we may call scsi_done after abort regarding this

	 * command has completed.

	 * Note: scsi_done must not block!

	 */

	read_unlock_irqrestore(&req->adapter->abort_lock, flags);

}



static void zfcp_fsf_send_fcp_ctm_handler(struct zfcp_fsf_req *req)

{

	struct fcp_resp_with_ext *fcp_rsp;

	struct fcp_resp_rsp_info *rsp_info;



	fcp_rsp = (struct fcp_resp_with_ext *) &req->qtcb->bottom.io.fcp_rsp;

	rsp_info = (struct fcp_resp_rsp_info *) &fcp_rsp[1];



	if ((rsp_info->rsp_code != FCP_TMF_CMPL) ||

	     (req->status & ZFCP_STATUS_FSFREQ_ERROR))

		req->status |= ZFCP_STATUS_FSFREQ_TMFUNCFAILED;

}





static void zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *req)

static void zfcp_fsf_fcp_handler_common(struct zfcp_fsf_req *req)

{

	struct scsi_cmnd *scmnd = req->data;

	struct scsi_device *sdev = scmnd->device;
@@ -2154,7 +2088,7 @@ static void zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *req) 
	struct fsf_qtcb_header *header = &req->qtcb->header;



	if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR))

		goto skip_fsfstatus;

		return;



	switch (header->fsf_status) {

	case FSF_HANDLE_MISMATCH:
@@ -2211,12 +2145,60 @@ static void zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *req) 
		req->status |= ZFCP_STATUS_FSFREQ_ERROR;

		break;

	}

skip_fsfstatus:

	if (req->status & ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT)

		zfcp_fsf_send_fcp_ctm_handler(req);

	else {

		zfcp_fsf_send_fcp_command_task_handler(req);

}



static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req)

{

	struct scsi_cmnd *scpnt;

	struct fcp_resp_with_ext *fcp_rsp;

	unsigned long flags;



	zfcp_fsf_fcp_handler_common(req);



	read_lock_irqsave(&req->adapter->abort_lock, flags);



	scpnt = req->data;

	if (unlikely(!scpnt)) {

		read_unlock_irqrestore(&req->adapter->abort_lock, flags);

		return;

	}



	if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {

		set_host_byte(scpnt, DID_TRANSPORT_DISRUPTED);

		goto skip_fsfstatus;

	}



	switch (req->qtcb->header.fsf_status) {

	case FSF_INCONSISTENT_PROT_DATA:

	case FSF_INVALID_PROT_PARM:

		set_host_byte(scpnt, DID_ERROR);

		goto skip_fsfstatus;

	case FSF_BLOCK_GUARD_CHECK_FAILURE:

		zfcp_scsi_dif_sense_error(scpnt, 0x1);

		goto skip_fsfstatus;

	case FSF_APP_TAG_CHECK_FAILURE:

		zfcp_scsi_dif_sense_error(scpnt, 0x2);

		goto skip_fsfstatus;

	case FSF_REF_TAG_CHECK_FAILURE:

		zfcp_scsi_dif_sense_error(scpnt, 0x3);

		goto skip_fsfstatus;

	}

	fcp_rsp = (struct fcp_resp_with_ext *) &req->qtcb->bottom.io.fcp_rsp;

	zfcp_fc_eval_fcp_rsp(fcp_rsp, scpnt);



skip_fsfstatus:

	zfcp_fsf_req_trace(req, scpnt);

	zfcp_dbf_scsi_result(req->adapter->dbf, scpnt, req);



	scpnt->host_scribble = NULL;

	(scpnt->scsi_done) (scpnt);

	/*

	 * We must hold this lock until scsi_done has been called.

	 * Otherwise we may call scsi_done after abort regarding this

	 * command has completed.

	 * Note: scsi_done must not block!

	 */

	read_unlock_irqrestore(&req->adapter->abort_lock, flags);

}



static int zfcp_fsf_set_data_dir(struct scsi_cmnd *scsi_cmnd, u32 *data_dir)
@@ -2299,7 +2281,7 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd) 
	io = &req->qtcb->bottom.io;

	req->status |= ZFCP_STATUS_FSFREQ_CLEANUP;

	req->data = scsi_cmnd;

	req->handler = zfcp_fsf_send_fcp_command_handler;

	req->handler = zfcp_fsf_fcp_cmnd_handler;

	req->qtcb->header.lun_handle = zfcp_sdev->lun_handle;

	req->qtcb->header.port_handle = zfcp_sdev->port->handle;

	io->service_class = FSF_CLASS_3;
@@ -2345,6 +2327,21 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd) 
	return retval;

}



static void zfcp_fsf_fcp_task_mgmt_handler(struct zfcp_fsf_req *req)

{

	struct fcp_resp_with_ext *fcp_rsp;

	struct fcp_resp_rsp_info *rsp_info;



	zfcp_fsf_fcp_handler_common(req);



	fcp_rsp = (struct fcp_resp_with_ext *) &req->qtcb->bottom.io.fcp_rsp;

	rsp_info = (struct fcp_resp_rsp_info *) &fcp_rsp[1];



	if ((rsp_info->rsp_code != FCP_TMF_CMPL) ||

	     (req->status & ZFCP_STATUS_FSFREQ_ERROR))

		req->status |= ZFCP_STATUS_FSFREQ_TMFUNCFAILED;

}



/**

 * zfcp_fsf_fcp_task_mgmt - send SCSI task management command

 * @scmnd: SCSI command to send the task management command for
@@ -2378,7 +2375,7 @@ struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_cmnd *scmnd, 


	req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;

	req->data = scmnd;

	req->handler = zfcp_fsf_send_fcp_command_handler;

	req->handler = zfcp_fsf_fcp_task_mgmt_handler;

	req->qtcb->header.lun_handle = zfcp_sdev->lun_handle;

	req->qtcb->header.port_handle = zfcp_sdev->port->handle;

	req->qtcb->bottom.io.data_direction = FSF_DATADIR_CMND;