diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:54:01 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:54:01 -0700 |
| commit | 297b8a07347555f0d2fafa4a1ddfc332d2d4afa9 (patch) | |
| tree | 7c54ce22c1cd10118b5094441b8d7da2f4c58d6a /include/scsi | |
| parent | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (diff) | |
| parent | 6df339a51e3bf18b868384bdeb31e49a4fbaa3d8 (diff) | |
| download | linux-3.10-297b8a07347555f0d2fafa4a1ddfc332d2d4afa9.tar.gz linux-3.10-297b8a07347555f0d2fafa4a1ddfc332d2d4afa9.tar.bz2 linux-3.10-297b8a07347555f0d2fafa4a1ddfc332d2d4afa9.zip | |
Merge branch 'postmerge' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_device.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index a7f9cba275e..cc645876d14 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -394,10 +394,18 @@ extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, int data_direction, void *buffer, unsigned bufflen, unsigned char *sense, int timeout, int retries, int flag, int *resid); -extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, - int data_direction, void *buffer, unsigned bufflen, - struct scsi_sense_hdr *, int timeout, int retries, - int *resid); +extern 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 flags); +static inline int scsi_execute_req(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) +{ + return scsi_execute_req_flags(sdev, cmd, data_direction, buffer, + bufflen, sshdr, timeout, retries, resid, 0); +} extern void sdev_disable_disk_events(struct scsi_device *sdev); extern void sdev_enable_disk_events(struct scsi_device *sdev); |