Commit 68f89c50 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: zfcp_scsi: Call scsi_done() directly 

Conditional statements are faster than indirect calls. Hence call
scsi_done() directly.

Link: https://lore.kernel.org/r/20211007202923.2174984-8-bvanassche@acm.org


Acked-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1ae6d167

drivers/s390/scsi/zfcp_fsf.c

+1 −1
Original line number Diff line number Diff line
@@ -2501,7 +2501,7 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req) 
	zfcp_dbf_scsi_result(scpnt, req);



	scpnt->host_scribble = NULL;

	(scpnt->scsi_done) (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

drivers/s390/scsi/zfcp_scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static void zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result) 
{

	set_host_byte(scpnt, result);

	zfcp_dbf_scsi_fail_send(scpnt);

	scpnt->scsi_done(scpnt);

	scsi_done(scpnt);

}



static
@@ -78,7 +78,7 @@ int zfcp_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scpnt) 
	if (unlikely(scsi_result)) {

		scpnt->result = scsi_result;

		zfcp_dbf_scsi_fail_send(scpnt);

		scpnt->scsi_done(scpnt);

		scsi_done(scpnt);

		return 0;

	}