diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2014-04-10 04:20:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-10 04:26:20 +0200 |
| commit | 2bfad21ecc6f837de29743f4419f47dee3fac9e2 (patch) | |
| tree | 9864ba0b27af0f6f2e8f0efba9a7a1bab4afa8de /include | |
| parent | block: Ensure we only enable integrity metadata for reads and writes (diff) | |
| download | linux-2bfad21ecc6f837de29743f4419f47dee3fac9e2.tar.xz linux-2bfad21ecc6f837de29743f4419f47dee3fac9e2.zip | |
scsi: Make sure cmd_flags are 64-bit
cmd_flags in struct request is now 64 bits wide but the scsi_execute
functions truncated arguments passed to int leading to errors. Make sure
the flags parameters are u64.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Jens Axboe <axboe@fb.com>
CC: Jan Kara <jack@suse.cz>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 4e845b80efd3..5853c913d2b0 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -423,11 +423,11 @@ extern int scsi_is_target_device(const struct device *); 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); + u64 flags, 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); + int retries, int *resid, u64 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, |