Commit f55cf47d authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: Use DID_REQUEUE 

Moving to use DID_REQUEUE return type for reliable unconditional
retries.  Driver wants unconditional re-queue, so replace DID_RESET with
DID_REQUEUE

Discussed below -
https://www.spinics.net/lists/linux-scsi/msg102848.html



Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ed981b81

drivers/scsi/megaraid/megaraid_sas_base.c

+2 −2
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd) 
	/* Check for an mpio path and adjust behavior */

	if (atomic_read(&instance->adprecovery) == MEGASAS_ADPRESET_SM_INFAULT) {

		if (megasas_check_mpio_paths(instance, scmd) ==

		    (DID_RESET << 16)) {

		    (DID_REQUEUE << 16)) {

			return SCSI_MLQUEUE_HOST_BUSY;

		} else {

			scmd->result = DID_NO_CONNECT << 16;
@@ -2492,7 +2492,7 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance) 
						struct megasas_cmd, list);

			list_del_init(&reset_cmd->list);

			if (reset_cmd->scmd) {

				reset_cmd->scmd->result = DID_RESET << 16;

				reset_cmd->scmd->result = DID_REQUEUE << 16;

				dev_notice(&instance->pdev->dev, "%d:%p reset [%02x]\n",

					reset_index, reset_cmd,

					reset_cmd->scmd->cmnd[0]);

drivers/scsi/megaraid/megaraid_sas_fusion.c

+1 −1
Original line number Diff line number Diff line
@@ -3770,7 +3770,7 @@ int megasas_check_mpio_paths(struct megasas_instance *instance, 
	struct scsi_cmnd *scmd)

{

	struct megasas_instance *peer_instance = NULL;

	int retval = (DID_RESET << 16);

	int retval = (DID_REQUEUE << 16);



	if (instance->peerIsPresent) {

		peer_instance = megasas_get_peer_instance(instance);

CRA Git | Maintained and supported by SUSTech CRA and CCSE