drivers: scsi: storvsc: Set srb_flags in all cases

Correctly set SRB flags for all valid I/O directions. Some IHV drivers on the
Windows host require this. The host validates the command and SRB flags
prior to passing the command down to native driver stack.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 2b8595b7ad45d6c5116038b573d10eb58daaaacc..b529ae8e8fff4ce051fd1a2e74e1e39d74862c4b 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1601,26 +1601,24 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
        vm_srb = &cmd_request->vstor_packet.vm_srb;
        vm_srb->win8_extension.time_out_value = 60;
 
+       vm_srb->win8_extension.srb_flags |=
+               (SRB_FLAGS_QUEUE_ACTION_ENABLE |
+               SRB_FLAGS_DISABLE_SYNCH_TRANSFER);
 
        /* Build the SRB */
        switch (scmnd->sc_data_direction) {
        case DMA_TO_DEVICE:
                vm_srb->data_in = WRITE_TYPE;
                vm_srb->win8_extension.srb_flags |= SRB_FLAGS_DATA_OUT;
-               vm_srb->win8_extension.srb_flags |=
-                       (SRB_FLAGS_QUEUE_ACTION_ENABLE |
-                       SRB_FLAGS_DISABLE_SYNCH_TRANSFER);
                break;
        case DMA_FROM_DEVICE:
                vm_srb->data_in = READ_TYPE;
                vm_srb->win8_extension.srb_flags |= SRB_FLAGS_DATA_IN;
-               vm_srb->win8_extension.srb_flags |=
-                       (SRB_FLAGS_QUEUE_ACTION_ENABLE |
-                       SRB_FLAGS_DISABLE_SYNCH_TRANSFER);
                break;
        default:
                vm_srb->data_in = UNKNOWN_TYPE;
-               vm_srb->win8_extension.srb_flags = 0;
+               vm_srb->win8_extension.srb_flags |= (SRB_FLAGS_DATA_IN |
+                                                    SRB_FLAGS_DATA_OUT);
                break;
        }