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

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

[SCSI] zfcp: Fix evaluation of port handles in abort handler 



According to the FSF spec, word 0 (bytes 0-3) has the handle
specified with the abort command and word 1 (bytes 4-7) has the
handle for the command to be aborted. Fix the if statements
that try to compare those.

Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarMartin Peschke <mp3@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d1ad09db

drivers/s390/scsi/zfcp_fsf.c

+4 −5
Original line number Diff line number Diff line
@@ -1164,8 +1164,8 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req) 
{

	int retval = -EINVAL;

	struct zfcp_unit *unit;

	unsigned char status_qual =

	    new_fsf_req->qtcb->header.fsf_status_qual.word[0];

	union fsf_status_qual *fsf_stat_qual =

		&new_fsf_req->qtcb->header.fsf_status_qual;



	if (new_fsf_req->status & ZFCP_STATUS_FSFREQ_ERROR) {

		/* do not set ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED */
@@ -1178,7 +1178,7 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req) 
	switch (new_fsf_req->qtcb->header.fsf_status) {



	case FSF_PORT_HANDLE_NOT_VALID:

		if (status_qual >> 4 != status_qual % 0xf) {

		if (fsf_stat_qual->word[0] != fsf_stat_qual->word[1]) {

			debug_text_event(new_fsf_req->adapter->erp_dbf, 3,

					 "fsf_s_phand_nv0");

			/*
@@ -1207,8 +1207,7 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req) 
		break;



	case FSF_LUN_HANDLE_NOT_VALID:

		if (status_qual >> 4 != status_qual % 0xf) {

			/* 2 */

		if (fsf_stat_qual->word[0] != fsf_stat_qual->word[1]) {

			debug_text_event(new_fsf_req->adapter->erp_dbf, 3,

					 "fsf_s_lhand_nv0");

			/*