Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 248948
b: refs/heads/master
c: e9e936c
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 96fa2c1 commit b6b2c30
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6dc3f0a7edf15fcaf90270b1ac6de501fe6a60c6
refs/heads/master: e9e936c60dfa4ea5ead0ddf5f9ee457a1906366d
46 changes: 25 additions & 21 deletions trunk/drivers/staging/hv/blkvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,9 @@ static int blkvsc_do_flush(struct block_device_context *blkdev)
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.data_buffer.pfn_array[0] = 0;
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 0;
blkvsc_req->request.extension.data_buffer.pfn_array[0] = 0;
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 0;

blkvsc_req->cmnd[0] = SYNCHRONIZE_CACHE;
blkvsc_req->cmd_len = 10;
Expand Down Expand Up @@ -569,9 +569,10 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev)
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.data_buffer.pfn_array[0] = page_to_pfn(page_buf);
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 64;
blkvsc_req->request.extension.data_buffer.pfn_array[0] =
page_to_pfn(page_buf);
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 64;

blkvsc_req->cmnd[0] = INQUIRY;
blkvsc_req->cmnd[1] = 0x1; /* Get product data */
Expand Down Expand Up @@ -658,9 +659,10 @@ static int blkvsc_do_read_capacity(struct block_device_context *blkdev)
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.data_buffer.pfn_array[0] = page_to_pfn(page_buf);
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 8;
blkvsc_req->request.extension.data_buffer.pfn_array[0] =
page_to_pfn(page_buf);
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 8;

blkvsc_req->cmnd[0] = READ_CAPACITY;
blkvsc_req->cmd_len = 16;
Expand Down Expand Up @@ -737,9 +739,10 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev)
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.data_buffer.pfn_array[0] = page_to_pfn(page_buf);
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 12;
blkvsc_req->request.extension.data_buffer.pfn_array[0] =
page_to_pfn(page_buf);
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 12;

blkvsc_req->cmnd[0] = 0x9E; /* READ_CAPACITY16; */
blkvsc_req->cmd_len = 16;
Expand Down Expand Up @@ -928,8 +931,8 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
(blkvsc_req->write) ? "WRITE" : "READ",
(unsigned long) blkvsc_req->sector_start,
blkvsc_req->sector_count,
blkvsc_req->request.data_buffer.offset,
blkvsc_req->request.data_buffer.len);
blkvsc_req->request.extension.data_buffer.offset,
blkvsc_req->request.extension.data_buffer.len);
#if 0
for (i = 0; i < (blkvsc_req->request.data_buffer.len >> 12); i++) {
DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - "
Expand Down Expand Up @@ -1056,10 +1059,11 @@ static int blkvsc_do_request(struct block_device_context *blkdev,

blkvsc_req->dev = blkdev;
blkvsc_req->req = req;
blkvsc_req->request.data_buffer.offset
= bvec->bv_offset;
blkvsc_req->request.data_buffer.len
= 0;
blkvsc_req->request.extension.
data_buffer.offset
= bvec->bv_offset;
blkvsc_req->request.extension.
data_buffer.len = 0;

/* Add to the group */
blkvsc_req->group = group;
Expand All @@ -1073,10 +1077,10 @@ static int blkvsc_do_request(struct block_device_context *blkdev,
}

/* Add the curr bvec/segment to the curr blkvsc_req */
blkvsc_req->request.data_buffer.
blkvsc_req->request.extension.data_buffer.
pfn_array[databuf_idx]
= page_to_pfn(bvec->bv_page);
blkvsc_req->request.data_buffer.len
blkvsc_req->request.extension.data_buffer.len
+= bvec->bv_len;

prev_bvec = bvec;
Expand Down Expand Up @@ -1182,7 +1186,7 @@ static void blkvsc_request_completion(struct hv_storvsc_request *request)
(blkvsc_req->write) ? "WRITE" : "READ",
(unsigned long)blkvsc_req->sector_start,
blkvsc_req->sector_count,
blkvsc_req->request.data_buffer.len,
blkvsc_req->request.extension.data_buffer.len,
blkvsc_req->group->outstanding,
blkdev->num_outstanding_reqs);

Expand Down
10 changes: 6 additions & 4 deletions trunk/drivers/staging/hv/storvsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ int stor_vsc_on_io_request(struct hv_device *device,
request_extension);

DPRINT_DBG(STORVSC, "req %p len %d",
request, request->data_buffer.len);
request, request->extension.data_buffer.len);

if (!stor_device) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
Expand All @@ -549,7 +549,8 @@ int stor_vsc_on_io_request(struct hv_device *device,
vstor_packet->vm_srb.sense_info_length = SENSE_BUFFER_SIZE;


vstor_packet->vm_srb.data_transfer_length = request->data_buffer.len;
vstor_packet->vm_srb.data_transfer_length =
request->extension.data_buffer.len;

vstor_packet->operation = VSTOR_OPERATION_EXECUTE_SRB;

Expand All @@ -563,9 +564,10 @@ int stor_vsc_on_io_request(struct hv_device *device,
vstor_packet->vm_srb.sense_info_length,
vstor_packet->vm_srb.cdb_length);

if (request_extension->request->data_buffer.len) {
if (request_extension->request->extension.data_buffer.len) {
ret = vmbus_sendpacket_multipagebuffer(device->channel,
&request_extension->request->data_buffer,
&request_extension->request->extension.
data_buffer,
vstor_packet,
sizeof(struct vstor_packet),
(unsigned long)request_extension);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/storvsc_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ struct storvsc_request_extension {
unsigned char *sense_buffer;
void *context;
void (*on_io_completion)(struct hv_storvsc_request *request);
struct hv_multipage_buffer data_buffer;

struct vstor_packet vstor_packet;
};
Expand All @@ -73,7 +74,6 @@ struct hv_storvsc_request {

struct storvsc_request_extension extension;

struct hv_multipage_buffer data_buffer;
};

/* Represents the block vsc driver */
Expand Down
13 changes: 7 additions & 6 deletions trunk/drivers/staging/hv/storvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,8 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)

/* ASSERT(request->BytesXfer <= request->data_buffer.Length); */
scsi_set_resid(scmnd,
request->data_buffer.len - vm_srb->data_transfer_length);
request->extension.data_buffer.len -
vm_srb->data_transfer_length);

scsi_done_fn = scmnd->scsi_done;

Expand Down Expand Up @@ -789,7 +790,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
request->extension.sense_buffer = scmnd->sense_buffer;


request->data_buffer.len = scsi_bufflen(scmnd);
request->extension.data_buffer.len = scsi_bufflen(scmnd);
if (scsi_sg_count(scmnd)) {
sgl = (struct scatterlist *)scsi_sglist(scmnd);
sg_count = scsi_sg_count(scmnd);
Expand Down Expand Up @@ -830,19 +831,19 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
sg_count = cmd_request->bounce_sgl_count;
}

request->data_buffer.offset = sgl[0].offset;
request->extension.data_buffer.offset = sgl[0].offset;

for (i = 0; i < sg_count; i++) {
DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d\n",
i, sgl[i].length, sgl[i].offset);
request->data_buffer.pfn_array[i] =
request->extension.data_buffer.pfn_array[i] =
page_to_pfn(sg_page((&sgl[i])));
}
} else if (scsi_sglist(scmnd)) {
/* ASSERT(scsi_bufflen(scmnd) <= PAGE_SIZE); */
request->data_buffer.offset =
request->extension.data_buffer.offset =
virt_to_phys(scsi_sglist(scmnd)) & (PAGE_SIZE-1);
request->data_buffer.pfn_array[0] =
request->extension.data_buffer.pfn_array[0] =
virt_to_phys(scsi_sglist(scmnd)) >> PAGE_SHIFT;
}

Expand Down

0 comments on commit b6b2c30

Please sign in to comment.