mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 12:37:32 +00:00
Code Issues Releases Wiki Activity

Staging: hv: Get rid of the target_id from struct hv_storvsc_request

Browse source 
In preparation for consolidating all I/O request state, get rid of the
target_id field from struct hv_storvsc_request and instead use the
equivalent  state in struct vmscsi_request - target_id field.

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>
This commit is contained in:
K. Y. Srinivasan 2011-03-28 09:33:34 -07:00 committed by Greg Kroah-Hartman
parent 735625fe4d
commit b4dba0a3b4
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/hv/blkvsc_drv.c
View file

@ -945,7 +945,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
vm_srb->port_number = blkdev->port;
vm_srb->path_id = blkdev->path;
storvsc_req->target_id = blkdev->target;
vm_srb->target_id = blkdev->target;
storvsc_req->lun_id = 0; /* this is not really used at all */
storvsc_req->cdb_len = blkvsc_req->cmd_len;

5
drivers/staging/hv/storvsc.c
View file

@ -531,9 +531,9 @@ int stor_vsc_on_io_request(struct hv_device *device,
"Extension %p", device, stor_device, request,
request_extension);
DPRINT_DBG(STORVSC, "req %p len %d target %d, lun %d cdblen %d",
DPRINT_DBG(STORVSC, "req %p len %d lun %d cdblen %d",
request, request->data_buffer.len,
request->target_id, request->lun_id, request->cdb_len);
request->lun_id, request->cdb_len);
if (!stor_device) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
@ -549,7 +549,6 @@ int stor_vsc_on_io_request(struct hv_device *device,
vstor_packet->vm_srb.length = sizeof(struct vmscsi_request);
vstor_packet->vm_srb.target_id = request->target_id;
vstor_packet->vm_srb.lun = request->lun_id;
vstor_packet->vm_srb.sense_info_length = SENSE_BUFFER_SIZE;

1
drivers/staging/hv/storvsc_api.h
View file

@ -66,7 +66,6 @@ struct storvsc_request_extension {
};
struct hv_storvsc_request {
u32 target_id;
u32 lun_id;
u8 *cdb;
u32 cdb_len;

2
drivers/staging/hv/storvsc_drv.c
View file

@ -776,7 +776,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
/* request->PortId = scmnd->device->channel; */
vm_srb->port_number = host_device_ctx->port;
vm_srb->path_id = scmnd->device->channel;
request->target_id = scmnd->device->id;
vm_srb->target_id = scmnd->device->id;
request->lun_id = scmnd->device->lun;
/* ASSERT(scmnd->cmd_len <= 16); */