Skip to content

Commit

Permalink
Staging: hv: Move sense_buffer field
Browse files Browse the repository at this point in the history
In preparation for consolidating all I/O request state,
move sense_buffer field from struct hv_storvsc_request
to struct storvsc_request_extension.

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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 6f461cc commit 237ecd6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,

memcpy(vm_srb->cdb, blkvsc_req->cmnd, vm_srb->cdb_length);

storvsc_req->sense_buffer = blkvsc_req->sense_buffer;
storvsc_req->extension.sense_buffer = blkvsc_req->sense_buffer;

ret = storvsc_drv_obj->on_io_request(blkdev->device_ctx,
&blkvsc_req->request);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/storvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
"valid - len %d\n", request_ext,
vstor_packet->vm_srb.sense_info_length);

memcpy(request->sense_buffer,
memcpy(request->extension.sense_buffer,
vstor_packet->vm_srb.sense_data,
vstor_packet->vm_srb.sense_info_length);

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/hv/storvsc_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ struct storvsc_request_extension {
/* Synchronize the request/response if needed */
struct completion wait_event;

unsigned char *sense_buffer;

struct vstor_packet vstor_packet;
};

struct hv_storvsc_request {
u32 status;
u32 bytes_xfer;

unsigned char *sense_buffer;

void *context;

void (*on_io_completion)(struct hv_storvsc_request *request);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/storvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,

memcpy(vm_srb->cdb, scmnd->cmnd, vm_srb->cdb_length);

request->sense_buffer = scmnd->sense_buffer;
request->extension.sense_buffer = scmnd->sense_buffer;


request->data_buffer.len = scsi_bufflen(scmnd);
Expand Down

0 comments on commit 237ecd6

Please sign in to comment.