mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
Staging: hv: Get rid of the bus field from struct hv_storvsc_request
In preparation for consolidating all I/O request state, get rid of the bus field from struct hv_storvsc_request and instead use the equivalent state in struct vmscsi_request - path_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:
parent
124661ded3
commit
735625fe4d
4 changed files with 4 additions and 6 deletions
|
@ -944,7 +944,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
|
|||
storvsc_req->context = blkvsc_req;
|
||||
|
||||
vm_srb->port_number = blkdev->port;
|
||||
storvsc_req->bus = blkdev->path;
|
||||
vm_srb->path_id = blkdev->path;
|
||||
storvsc_req->target_id = blkdev->target;
|
||||
storvsc_req->lun_id = 0; /* this is not really used at all */
|
||||
|
||||
|
|
|
@ -531,8 +531,8 @@ 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 bus %d, target %d, lun %d cdblen %d",
|
||||
request, request->data_buffer.len, request->bus,
|
||||
DPRINT_DBG(STORVSC, "req %p len %d target %d, lun %d cdblen %d",
|
||||
request, request->data_buffer.len,
|
||||
request->target_id, request->lun_id, request->cdb_len);
|
||||
|
||||
if (!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.path_id = request->bus;
|
||||
vstor_packet->vm_srb.target_id = request->target_id;
|
||||
vstor_packet->vm_srb.lun = request->lun_id;
|
||||
|
||||
|
|
|
@ -66,7 +66,6 @@ struct storvsc_request_extension {
|
|||
};
|
||||
|
||||
struct hv_storvsc_request {
|
||||
u32 bus;
|
||||
u32 target_id;
|
||||
u32 lun_id;
|
||||
u8 *cdb;
|
||||
|
|
|
@ -775,7 +775,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
|
|||
|
||||
/* request->PortId = scmnd->device->channel; */
|
||||
vm_srb->port_number = host_device_ctx->port;
|
||||
request->bus = scmnd->device->channel;
|
||||
vm_srb->path_id = scmnd->device->channel;
|
||||
request->target_id = scmnd->device->id;
|
||||
request->lun_id = scmnd->device->lun;
|
||||
|
||||
|
|
Loading…
Reference in a new issue