lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] convert sd to scsi_execute_req (and update the scsi_execute_req API)

Browse Source 
This one removes struct scsi_request entirely from sd.  In the process,
I noticed we have no callers of scsi_wait_req who don't immediately
normalise the sense, so I updated the API to make it take a struct
scsi_sense_hdr instead of simply a big sense buffer.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2005-08-28 11:33:52 -05:00
parent 33aa687db9
commit ea73a9f239
7 changed files with 146 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/scsi_ioctl.c
View File

@ -90,19 +90,16 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
{
int result;
struct scsi_sense_hdr sshdr;
char sense[SCSI_SENSE_BUFFERSIZE];
SCSI_LOG_IOCTL(1, printk("Trying ioctl with scsi command %d\n", *cmd));
memset(sense, 0, sizeof(*sense));
result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0,
sense, timeout, retries);
&sshdr, timeout, retries);
SCSI_LOG_IOCTL(2, printk("Ioctl returned 0x%x\n", result));
if ((driver_byte(result) & DRIVER_SENSE) &&
(scsi_normalize_sense(sense, sizeof(*sense), &sshdr))) {
(scsi_sense_valid(&sshdr))) {
switch (sshdr.sense_key) {
case ILLEGAL_REQUEST:
if (cmd[0] == ALLOW_MEDIUM_REMOVAL)
@ -132,7 +129,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
sdev->id,
sdev->lun,
result);
__scsi_print_sense(" ", sense, sizeof(*sense));
scsi_print_sense_hdr(" ", &sshdr);
break;
}
}
@ -315,9 +312,9 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
break;
}
result = scsi_execute_req(sdev, cmd, data_direction, buf, needed,
sense, timeout, retries);
result = scsi_execute(sdev, cmd, data_direction, buf, needed,
sense, timeout, retries, 0);
/*
* If there was an error condition, pass the info back to the user.
*/