aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2014-04-09 22:20:48 -0400
committerJens Axboe <axboe@fb.com>2014-04-09 22:26:20 -0400
commit2bfad21ecc6f837de29743f4419f47dee3fac9e2 (patch)
tree9864ba0b27af0f6f2e8f0efba9a7a1bab4afa8de /include/scsi
parente69f18f06b97ed29645d020500222bfcec2b42b2 (diff)
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/scsi')
-rw-r--r--include/scsi/scsi_device.h4
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 *);
423extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 423extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
424 int data_direction, void *buffer, unsigned bufflen, 424 int data_direction, void *buffer, unsigned bufflen,
425 unsigned char *sense, int timeout, int retries, 425 unsigned char *sense, int timeout, int retries,
426 int flag, int *resid); 426 u64 flags, int *resid);
427extern int scsi_execute_req_flags(struct scsi_device *sdev, 427extern int scsi_execute_req_flags(struct scsi_device *sdev,
428 const unsigned char *cmd, int data_direction, void *buffer, 428 const unsigned char *cmd, int data_direction, void *buffer,
429 unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout, 429 unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,
430 int retries, int *resid, int flags); 430 int retries, int *resid, u64 flags);
431static inline int scsi_execute_req(struct scsi_device *sdev, 431static inline int scsi_execute_req(struct scsi_device *sdev,
432 const unsigned char *cmd, int data_direction, void *buffer, 432 const unsigned char *cmd, int data_direction, void *buffer,
433 unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout, 433 unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,