struct completion wait_event;
 
        unsigned char *sense_buffer;
-       void *context;
+       struct storvsc_cmd_request  *cmd;
        struct hv_multipage_buffer data_buffer;
 
        struct vstor_packet vstor_packet;
 
 static void storvsc_command_completion(struct hv_storvsc_request *request)
 {
-       struct storvsc_cmd_request *cmd_request =
-               (struct storvsc_cmd_request *)request->context;
+       struct storvsc_cmd_request *cmd_request = request->cmd;
        struct scsi_cmnd *scmnd = cmd_request->cmd;
        struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
        void (*scsi_done_fn)(struct scsi_cmnd *);
                break;
        }
 
-       request->context = cmd_request;/* scmnd; */
+       request->cmd = cmd_request;
 
        vm_srb->port_number = host_dev->port;
        vm_srb->path_id = scmnd->device->channel;