diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-13 13:54:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 15:12:15 +1000 |
| commit | cf7b7979f2f379a565bd940628f0f7d52bd0fe86 (patch) | |
| tree | 9ff936ea0ab95487d3095b6cc6aa98a68b7e8200 /drivers | |
| parent | 454bc4447cbb33781e767592252048b57db76f01 (diff) | |
scsi/block: fixup scsi_transport_fc for block changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 4df8c3c806f6..c8b8fb7ba3ed 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -3425,13 +3425,13 @@ fc_bsg_jobdone(struct fc_bsg_job *job) job->req->sense_len = job->reply_len; /* we assume all request payload was transferred, residual == 0 */ - req->data_len = 0; + req->__data_len = 0; if (rsp) { rsp_len = blk_rq_bytes(rsp); BUG_ON(job->reply->reply_payload_rcv_len > rsp_len); /* set reply (bidi) residual */ - rsp->data_len = (rsp_len - job->reply->reply_payload_rcv_len); + rsp->__data_len = (rsp_len - job->reply->reply_payload_rcv_len); } blk_end_bidi_request(req, err, req_len, rsp_len); @@ -3496,7 +3496,7 @@ fc_bsg_map_buffer(struct fc_bsg_buffer *buf, struct request *req) return -ENOMEM; sg_init_table(buf->sg_list, req->nr_phys_segments); buf->sg_cnt = blk_rq_map_sg(req->q, req, buf->sg_list); - buf->payload_len = req->data_len; + buf->payload_len = blk_rq_bytes(req); return 0; } @@ -3762,14 +3762,14 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost, return; while (!blk_queue_plugged(q)) { - req = elv_next_request(q); + req = blk_peek_request(q); if (!req) break; if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED)) break; - blkdev_dequeue_request(req); + blk_start_request(req); if (rport && (rport->port_state != FC_PORTSTATE_ONLINE)) { req->errors = -ENXIO; |