diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-03-28 09:33:42 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 21:55:11 -0700 |
| commit | 6dc3f0a7edf15fcaf90270b1ac6de501fe6a60c6 (patch) | |
| tree | a75fb47d8d419d2ab95cd882076e6d0a7627196c /drivers/staging/hv/storvsc.c | |
| parent | 0bb71127060b1abb76e8864d45f9be9e9fb2882d (diff) | |
Staging: hv: Get rid of the status field from struct hv_storvsc_request
In preparation of consolidating all I/O request state,
get rid of the status field from struct hv_storvsc_request
and instead use the state in the struct vmscsi_request directly.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/storvsc.c')
| -rw-r--r-- | drivers/staging/hv/storvsc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index d444cc9dfaf4..6a45d5752c08 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -296,9 +296,9 @@ static void stor_vsc_on_io_completion(struct hv_device *device, /* Copy over the status...etc */ - request->status = vstor_packet->vm_srb.scsi_status; - if (request->status != 0 || vstor_packet->vm_srb.srb_status != 1) { + 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], @@ -306,7 +306,7 @@ static void stor_vsc_on_io_completion(struct hv_device *device, vstor_packet->vm_srb.srb_status); } - if ((request->status & 0xFF) == 0x02) { + if ((vstor_packet->vm_srb.scsi_status & 0xFF) == 0x02) { /* CHECK_CONDITION */ if (vstor_packet->vm_srb.srb_status & 0x80) { /* autosense data available */ @@ -321,8 +321,6 @@ static void stor_vsc_on_io_completion(struct hv_device *device, } } - /* TODO: */ - request->bytes_xfer = vstor_packet->vm_srb.data_transfer_length; request->extension.on_io_completion(request); |