diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-09-02 17:16:41 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:47:12 -0400 |
| commit | e915e872ed921d707bc32b3f2184d43abfa8c9e2 (patch) | |
| tree | 698142e0a56622c3a3c0740522537dbff703732a /block | |
| parent | 5842e51ff2e8d660756248db80ad24e4f41977d9 (diff) | |
| download | linux-3.10-e915e872ed921d707bc32b3f2184d43abfa8c9e2.tar.gz linux-3.10-e915e872ed921d707bc32b3f2184d43abfa8c9e2.tar.bz2 linux-3.10-e915e872ed921d707bc32b3f2184d43abfa8c9e2.zip | |
[PATCH] switch sg_scsi_ioctl() to passing fmode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/scsi_ioctl.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 9a441559118..375e25df8ad 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -379,12 +379,11 @@ out: * bytes in one int) where the lowest byte is the SCSI status. */ #define OMAX_SB_LEN 16 /* For backward compatibility */ -int sg_scsi_ioctl(struct file *file, struct request_queue *q, - struct gendisk *disk, struct scsi_ioctl_command __user *sic) +int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, + struct scsi_ioctl_command __user *sic) { struct request *rq; int err; - fmode_t write_perm = 0; unsigned int in_len, out_len, bytes, opcode, cmdlen; char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; @@ -426,11 +425,7 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q, if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; - /* scsi_ioctl passes NULL */ - if (file && (file->f_mode & FMODE_WRITE)) - write_perm = FMODE_WRITE; - - err = blk_verify_command(&q->cmd_filter, rq->cmd, write_perm); + err = blk_verify_command(&q->cmd_filter, rq->cmd, mode & FMODE_WRITE); if (err) goto error; @@ -636,7 +631,7 @@ int scsi_cmd_ioctl(struct file *file, struct request_queue *q, if (!arg) break; - err = sg_scsi_ioctl(file, q, bd_disk, arg); + err = sg_scsi_ioctl(q, bd_disk, file ? file->f_mode : 0, arg); break; case CDROMCLOSETRAY: err = blk_send_start_stop(q, bd_disk, 0x03); |