Commit 16576ad8 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: core: Do not use DRIVER_INVALID 

There is no point in returning DID_ABORT together with DRIVER_INVALID, as
the caller couldn't care less where the abort originated.  So drop the use
of DRIVER_INVALID.

Link: https://lore.kernel.org/r/20210427083046.31620-11-hare@suse.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 464a00c9

drivers/scsi/hptiop.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static void hptiop_finish_scsi_req(struct hptiop_hba *hba, u32 tag, 
		goto skip_resid;



	default:

		scp->result = DRIVER_INVALID << 24 | DID_ABORT << 16;

		scp->result = DID_ABORT << 16;

		break;

	}

drivers/scsi/mvumi.c

+2 −2
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd, 
		}

		break;

	default:

		scmd->result |= (DRIVER_INVALID << 24) | (DID_ABORT << 16);

		scmd->result |= (DID_ABORT << 16);

		break;

	}
@@ -2127,7 +2127,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd) 
	else

		atomic_dec(&mhba->fw_outstanding);



	scmd->result = (DRIVER_INVALID << 24) | (DID_ABORT << 16);

	scmd->result = (DID_ABORT << 16);

	scmd->SCp.ptr = NULL;

	if (scsi_bufflen(scmd)) {

		dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd),

drivers/scsi/vmw_pvscsi.c

+0 −3
Original line number Diff line number Diff line
@@ -601,9 +601,6 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter, 
		case BTSTAT_LUNMISMATCH:

		case BTSTAT_TAGREJECT:

		case BTSTAT_BADMSG:

			cmd->result = (DRIVER_INVALID << 24);

			fallthrough;



		case BTSTAT_HAHARDWARE:

		case BTSTAT_INVPHASE:

		case BTSTAT_HATIMEOUT: