diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-04 00:24:39 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:24 -0500 |
commit | f4f4e47e4af6b02dd1c425b931c65d0165356e33 (patch) | |
tree | 1bca97ce56703d7a101674cf6bf0d28576cf7201 /drivers/ata/libata-scsi.c | |
parent | a528ab7a324f1dbb3598ae0ecd238ab7dd974294 (diff) |
[SCSI] add residual argument to scsi_execute and scsi_execute_req
scsi_execute() and scsi_execute_req() discard the residual length
information. Some callers need it. This adds residual argument
(optional) to scsi_execute and scsi_execute_req.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r-- | drivers/ata/libata-scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 47c7afcb36f2..b88e443027c4 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -517,7 +517,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) | |||
517 | /* Good values for timeout and retries? Values below | 517 | /* Good values for timeout and retries? Values below |
518 | from scsi_ioctl_send_command() for default case... */ | 518 | from scsi_ioctl_send_command() for default case... */ |
519 | cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize, | 519 | cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize, |
520 | sensebuf, (10*HZ), 5, 0); | 520 | sensebuf, (10*HZ), 5, 0, NULL); |
521 | 521 | ||
522 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ | 522 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ |
523 | u8 *desc = sensebuf + 8; | 523 | u8 *desc = sensebuf + 8; |
@@ -603,7 +603,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) | |||
603 | /* Good values for timeout and retries? Values below | 603 | /* Good values for timeout and retries? Values below |
604 | from scsi_ioctl_send_command() for default case... */ | 604 | from scsi_ioctl_send_command() for default case... */ |
605 | cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0, | 605 | cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0, |
606 | sensebuf, (10*HZ), 5, 0); | 606 | sensebuf, (10*HZ), 5, 0, NULL); |
607 | 607 | ||
608 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ | 608 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ |
609 | u8 *desc = sensebuf + 8; | 609 | u8 *desc = sensebuf + 8; |