shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

scsi: storvsc: properly set residual data length on errors

Browse Source 
am: 18dbfcae65

Change-Id: Icd112397502c0caed46d5c3613e9cb2720901e6f
This commit is contained in:
Long Li
2017-03-12 08:16:33 +00:00
committed by android-build-merger
parent 15c7c84688 18dbfcae65
commit ebf84b4166
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/storvsc_drv.c
View File

@@ -356,6 +356,7 @@ enum storvsc_request_type {
#define SRB_STATUS_SUCCESS 0x01
#define SRB_STATUS_ABORTED 0x02
#define SRB_STATUS_ERROR 0x04
#define SRB_STATUS_DATA_OVERRUN 0x12
#define SRB_STATUS(status) \
(status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN))
@@ -936,6 +937,7 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
struct scsi_sense_hdr sense_hdr;
struct vmscsi_request *vm_srb;
u32 data_transfer_length;
struct Scsi_Host *host;
struct storvsc_device *stor_dev;
struct hv_device *dev = host_dev->dev;
@@ -946,6 +948,7 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
host = stor_dev->host;
vm_srb = &cmd_request->vstor_packet.vm_srb;
data_transfer_length = vm_srb->data_transfer_length;
scmnd->result = vm_srb->scsi_status;
@@ -956,13 +959,20 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
&sense_hdr);
}
if (vm_srb->srb_status != SRB_STATUS_SUCCESS)
if (vm_srb->srb_status != SRB_STATUS_SUCCESS) {
storvsc_handle_error(vm_srb, scmnd, host, sense_hdr.asc,
sense_hdr.ascq);
/*
* The Windows driver set data_transfer_length on
* SRB_STATUS_DATA_OVERRUN. On other errors, this value
* is untouched. In these cases we set it to 0.
*/
if (vm_srb->srb_status != SRB_STATUS_DATA_OVERRUN)
data_transfer_length = 0;
}
scsi_set_resid(scmnd,
cmd_request->payload->range.len -
vm_srb->data_transfer_length);
cmd_request->payload->range.len - data_transfer_length);
scmnd->scsi_done(scmnd);