diff options
author | Christoph Hellwig <hch@lst.de> | 2006-06-03 07:21:13 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-06 11:07:25 -0400 |
commit | 5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068 (patch) | |
tree | d8569caefe1cb5ecced30929ef98d3e1fe642425 /drivers/scsi/sr.c | |
parent | e4a082c7c1f9a7b11fece6918e7ee5519b39ac46 (diff) |
[SCSI] fix up request buffer reference in various scsi drivers
Various scsi drivers use scsi_cmnd.buffer and scsi_cmnd.bufflen in their
queuecommand functions. Those fields are internal storage for the
midlayer only and are used to restore the original payload after
request_buffer and request_bufflen have been overwritten for EH. Using
the buffer and bufflen fields means they do very broken things in error
handling.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sr.c')
-rw-r--r-- | drivers/scsi/sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 7c80711e18ed..ebf6579ed698 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -217,7 +217,7 @@ int sr_media_change(struct cdrom_device_info *cdi, int slot) | |||
217 | static void rw_intr(struct scsi_cmnd * SCpnt) | 217 | static void rw_intr(struct scsi_cmnd * SCpnt) |
218 | { | 218 | { |
219 | int result = SCpnt->result; | 219 | int result = SCpnt->result; |
220 | int this_count = SCpnt->bufflen; | 220 | int this_count = SCpnt->request_bufflen; |
221 | int good_bytes = (result == 0 ? this_count : 0); | 221 | int good_bytes = (result == 0 ? this_count : 0); |
222 | int block_sectors = 0; | 222 | int block_sectors = 0; |
223 | long error_sector; | 223 | long error_sector; |