diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2014-04-09 22:20:48 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-04-09 22:26:20 -0400 |
commit | 2bfad21ecc6f837de29743f4419f47dee3fac9e2 (patch) | |
tree | 9864ba0b27af0f6f2e8f0efba9a7a1bab4afa8de /drivers/scsi | |
parent | e69f18f06b97ed29645d020500222bfcec2b42b2 (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 'drivers/scsi')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 5681c05ac506..65a123d9c676 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -184,7 +184,7 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason) | |||
184 | */ | 184 | */ |
185 | int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, | 185 | int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, |
186 | int data_direction, void *buffer, unsigned bufflen, | 186 | int data_direction, void *buffer, unsigned bufflen, |
187 | unsigned char *sense, int timeout, int retries, int flags, | 187 | unsigned char *sense, int timeout, int retries, u64 flags, |
188 | int *resid) | 188 | int *resid) |
189 | { | 189 | { |
190 | struct request *req; | 190 | struct request *req; |
@@ -235,7 +235,7 @@ EXPORT_SYMBOL(scsi_execute); | |||
235 | int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd, | 235 | int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd, |
236 | int data_direction, void *buffer, unsigned bufflen, | 236 | int data_direction, void *buffer, unsigned bufflen, |
237 | struct scsi_sense_hdr *sshdr, int timeout, int retries, | 237 | struct scsi_sense_hdr *sshdr, int timeout, int retries, |
238 | int *resid, int flags) | 238 | int *resid, u64 flags) |
239 | { | 239 | { |
240 | char *sense = NULL; | 240 | char *sense = NULL; |
241 | int result; | 241 | int result; |