Commit ff06c5ff authored Mar 07, 2016 by Vitaly Kuznetsov Committed by Martin K. Petersen Mar 08, 2016

scsi: storvsc: fix SRB_STATUS_ABORTED handling



Commit 3209f9d7 ("scsi: storvsc: Fix a bug in the handling of SRB
status flags") filtered SRB_STATUS_AUTOSENSE_VALID out effectively making
the (SRB_STATUS_ABORTED | SRB_STATUS_AUTOSENSE_VALID) case a dead code. The
logic from this branch (e.g. storvsc_device_scan() call) is still required,
fix the check.

Cc: <stable@vger.kernel.org> #v4.4+
Fixes: 3209f9d7 ("scsi: storvsc: Fix a bug in the handling of SRB status flags")
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Acked-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 84bd6499

drivers/scsi/storvsc_drv.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -914,8 +914,9 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,
	do_work = true;		do_work = true;
	process_err_fn = storvsc_remove_lun;		process_err_fn = storvsc_remove_lun;
	break;		break;
	case (SRB_STATUS_ABORTED \| SRB_STATUS_AUTOSENSE_VALID):		case SRB_STATUS_ABORTED:
	if ((asc == 0x2a) && (ascq == 0x9)) {		if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID &&
			(asc == 0x2a) && (ascq == 0x9)) {
	do_work = true;		do_work = true;
	process_err_fn = storvsc_device_scan;		process_err_fn = storvsc_device_scan;
	/*		/*