diff options
author | Boaz Harrosh <bharrosh@panasas.com> | 2007-12-13 06:47:40 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-30 14:03:40 -0500 |
commit | 30b0c37b27485a9cb897bfe3824f6f517b8c80d6 (patch) | |
tree | 22643da8e175ff7badf2413dc8c84b2e99613a6f /drivers/scsi/sd.c | |
parent | bb52d82f45df3a2661d88befba7c79a7db8be496 (diff) |
[SCSI] implement scsi_data_buffer
In preparation for bidi we abstract all IO members of scsi_cmnd,
that will need to duplicate, into a substructure.
- Group all IO members of scsi_cmnd into a scsi_data_buffer
structure.
- Adjust accessors to new members.
- scsi_{alloc,free}_sgtable receive a scsi_data_buffer instead of
scsi_cmnd. And work on it.
- Adjust scsi_init_io() and scsi_release_buffers() for above
change.
- Fix other parts of scsi_lib/scsi.c to members migration. Use
accessors where appropriate.
- fix Documentation about scsi_cmnd in scsi_host.h
- scsi_error.c
* Changed needed members of struct scsi_eh_save.
* Careful considerations in scsi_eh_prep/restore_cmnd.
- sd.c and sr.c
* sd and sr would adjust IO size to align on device's block
size so code needs to change once we move to scsi_data_buff
implementation.
* Convert code to use scsi_for_each_sg
* Use data accessors where appropriate.
- tgt: convert libsrp to use scsi_data_buffer
- isd200: This driver still bangs on scsi_cmnd IO members,
so need changing
[jejb: rebased on top of sg_table patches fixed up conflicts
and used the synergy to eliminate use_sg and sg_count]
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r-- | drivers/scsi/sd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 24eba3118b5a..51a5557f42dd 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -519,7 +519,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) | |||
519 | SCpnt->cmnd[4] = (unsigned char) this_count; | 519 | SCpnt->cmnd[4] = (unsigned char) this_count; |
520 | SCpnt->cmnd[5] = 0; | 520 | SCpnt->cmnd[5] = 0; |
521 | } | 521 | } |
522 | SCpnt->request_bufflen = this_count * sdp->sector_size; | 522 | SCpnt->sdb.length = this_count * sdp->sector_size; |
523 | 523 | ||
524 | /* | 524 | /* |
525 | * We shouldn't disconnect in the middle of a sector, so with a dumb | 525 | * We shouldn't disconnect in the middle of a sector, so with a dumb |
@@ -926,7 +926,7 @@ static struct block_device_operations sd_fops = { | |||
926 | static int sd_done(struct scsi_cmnd *SCpnt) | 926 | static int sd_done(struct scsi_cmnd *SCpnt) |
927 | { | 927 | { |
928 | int result = SCpnt->result; | 928 | int result = SCpnt->result; |
929 | unsigned int xfer_size = SCpnt->request_bufflen; | 929 | unsigned int xfer_size = scsi_bufflen(SCpnt); |
930 | unsigned int good_bytes = result ? 0 : xfer_size; | 930 | unsigned int good_bytes = result ? 0 : xfer_size; |
931 | u64 start_lba = SCpnt->request->sector; | 931 | u64 start_lba = SCpnt->request->sector; |
932 | u64 bad_lba; | 932 | u64 bad_lba; |