Staging: hv: Properly capture the error state

Properly capture the error state after the completion of I/O. This fixes a bug
that was introduced in the patch-set titled:
Staging: hv: Cleanup-storage-drivers-phase-II.
A corrected version of this patch-set was sent out earlier, however
the earlier (buggy) version of this patch-set was already applied.
This patch fixes the problem.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 55865fae7145e29660be57cf2a077875f94e52d1..d7ce3933b1dbd8bf634c4da1d44c2f6eb3a5cd57 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -279,6 +279,7 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
                                  struct hv_storvsc_request *request)
 {
        struct storvsc_device *stor_device;
+       struct vstor_packet *stor_pkt;
 
        stor_device = must_get_stor_device(device);
        if (!stor_device) {
@@ -287,19 +288,24 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
                return;
        }
 
-       DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request  %p "
+       DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request %p "
                   "completed bytes xfer %u", request,
                   vstor_packet->vm_srb.data_transfer_length);
 
+       stor_pkt = &request->vstor_packet;
 
 
        /* Copy over the status...etc */
+       stor_pkt->vm_srb.scsi_status = vstor_packet->vm_srb.scsi_status;
+       stor_pkt->vm_srb.srb_status = vstor_packet->vm_srb.srb_status;
+       stor_pkt->vm_srb.sense_info_length =
+       vstor_packet->vm_srb.sense_info_length;
 
        if (vstor_packet->vm_srb.scsi_status != 0 ||
                vstor_packet->vm_srb.srb_status != 1) {
                DPRINT_WARN(STORVSC,
                            "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
-                           vstor_packet->vm_srb.cdb[0],
+                           stor_pkt->vm_srb.cdb[0],
                            vstor_packet->vm_srb.scsi_status,
                            vstor_packet->vm_srb.srb_status);
        }
@@ -319,6 +325,8 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
                }
        }
 
+       stor_pkt->vm_srb.data_transfer_length =
+       vstor_packet->vm_srb.data_transfer_length;
 
        request->on_io_completion(request);
 
@@ -535,6 +543,7 @@ int stor_vsc_on_io_request(struct hv_device *device,
 
        request->device  = device;
 
+
        vstor_packet->flags |= REQUEST_COMPLETION_FLAG;
 
        vstor_packet->vm_srb.length = sizeof(struct vmscsi_request);