diff options
| author | James Bottomley | 2013-05-10 16:54:01 +0200 |
|---|---|---|
| committer | James Bottomley | 2013-05-10 16:54:01 +0200 |
| commit | 297b8a07347555f0d2fafa4a1ddfc332d2d4afa9 (patch) | |
| tree | 7c54ce22c1cd10118b5094441b8d7da2f4c58d6a /drivers/scsi/scsi_lib.c | |
| parent | Merge branch 'misc' into for-linus (diff) | |
| parent | [SCSI] sd: change to auto suspend mode (diff) | |
| download | kernel-qcow2-linux-297b8a07347555f0d2fafa4a1ddfc332d2d4afa9.tar.gz kernel-qcow2-linux-297b8a07347555f0d2fafa4a1ddfc332d2d4afa9.tar.xz kernel-qcow2-linux-297b8a07347555f0d2fafa4a1ddfc332d2d4afa9.zip | |
Merge branch 'postmerge' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index c31187d79343..86d522004a20 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -276,11 +276,10 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, } EXPORT_SYMBOL(scsi_execute); - -int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, +int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd, int data_direction, void *buffer, unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout, int retries, - int *resid) + int *resid, int flags) { char *sense = NULL; int result; @@ -291,14 +290,14 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, return DRIVER_ERROR << 24; } result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen, - sense, timeout, retries, 0, resid); + sense, timeout, retries, flags, resid); if (sshdr) scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, sshdr); kfree(sense); return result; } -EXPORT_SYMBOL(scsi_execute_req); +EXPORT_SYMBOL(scsi_execute_req_flags); /* * Function: scsi_init_cmd_errh() |