diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2015-10-06 18:04:01 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-11-09 16:29:42 -0800 |
| commit | 3209f9d780d137cdb54c85e0a776cb19e723a170 (patch) | |
| tree | 47f3789de670d61e26bb21d44eb245b998f498de /drivers/scsi/storvsc_drv.c | |
| parent | 81988a0e6b031bc80da15257201810ddcf989e64 (diff) | |
| download | linux-3209f9d780d137cdb54c85e0a776cb19e723a170.tar.gz linux-3209f9d780d137cdb54c85e0a776cb19e723a170.tar.bz2 linux-3209f9d780d137cdb54c85e0a776cb19e723a170.zip | |
scsi: storvsc: Fix a bug in the handling of SRB status flags
SRB status can have additional information. Mask these out before processing
SRB status.
This patch was sent as part of a collection of patches more than a year ago.
While the rest of the patches in the set were comitted, this patch was not.
I woulod like to thank Olaf for noticing that this patch was not committed
upstream.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Long Li <longli@microsoft.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi/storvsc_drv.c')
| -rw-r--r-- | drivers/scsi/storvsc_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index f56b89a6ef95..3fba42ad9fb8 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -349,11 +349,14 @@ enum storvsc_request_type { */ #define SRB_STATUS_AUTOSENSE_VALID 0x80 +#define SRB_STATUS_QUEUE_FROZEN 0x40 #define SRB_STATUS_INVALID_LUN 0x20 #define SRB_STATUS_SUCCESS 0x01 #define SRB_STATUS_ABORTED 0x02 #define SRB_STATUS_ERROR 0x04 +#define SRB_STATUS(status) \ + (status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN)) /* * This is the end of Protocol specific defines. */ @@ -858,7 +861,7 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb, void (*process_err_fn)(struct work_struct *work); bool do_work = false; - switch (vm_srb->srb_status) { + switch (SRB_STATUS(vm_srb->srb_status)) { case SRB_STATUS_ERROR: /* * If there is an error; offline the device since all |