From 60463d5916abdbf933198b3116a4953dbf33cfe7 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" <[mailto:kys@microsoft.com]> Date: Fri, 30 Mar 2012 17:47:03 +0100 Subject: Drivers: scsi: storvsc: Properly handle errors from the host If the host returns error for pass through commands, deal with appropriately. I would like to thank James for patiently helping me with this patch. Signed-off-by: K. Y. Srinivasan Reviewed-by: Haiyang Zhang Receieved directly from the upstream maintainer. This is the current state of the art for this patch, though discussion continues. Signed-off-by: Andy Whitcroft --- drivers/scsi/storvsc_drv.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 83a1972a199..50537696335 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -785,12 +785,24 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request) /* * If there is an error; offline the device since all * error recovery strategies would have already been - * deployed on the host side. + * deployed on the host side. However, if the command + * were a pass-through command deal with it appropriately. */ - if (vm_srb->srb_status == SRB_STATUS_ERROR) - scmnd->result = DID_TARGET_FAILURE << 16; - else + switch (vm_srb->srb_status) { + case SRB_STATUS_ERROR: + switch (scmnd->cmnd[0]) { + case ATA_16: + case ATA_12: + scmnd->result = DID_PASSTHROUGH << 16; + break; + default: + scmnd->result = DID_TARGET_FAILURE << 16; + } + break; + default: scmnd->result = vm_srb->scsi_status; + } + /* * If the LUN is invalid; remove the device. -- cgit v1.2.3