diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-12 03:03:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-12 03:03:59 -0700 |
| commit | a74ee53ef07ebabf364de7cce9436568b3ec8891 (patch) | |
| tree | d7c91a1f5974aa510a7eeb305350bdadac1ef230 /include/linux | |
| parent | 1dde9f572944d38ef06059565dcf089ffa93eefa (diff) | |
Pass done file pointer to block device ioctl's
They'll need it for permission checking.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/cdrom.h | 4 | ||||
| -rw-r--r-- | include/linux/ide.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7df0f31bfe7d..eb4d10be7e60 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -517,7 +517,7 @@ extern int blk_remove_plug(request_queue_t *); extern void blk_recount_segments(request_queue_t *, struct bio *); extern int blk_phys_contig_segment(request_queue_t *q, struct bio *, struct bio *); extern int blk_hw_contig_segment(request_queue_t *q, struct bio *, struct bio *); -extern int scsi_cmd_ioctl(struct gendisk *, unsigned int, void __user *); +extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *); extern void blk_start_queue(request_queue_t *q); extern void blk_stop_queue(request_queue_t *q); extern void __blk_stop_queue(request_queue_t *q); diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 282e9b793e36..0e46b2d0de0b 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -984,8 +984,8 @@ struct cdrom_device_ops { extern int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp); extern int cdrom_release(struct cdrom_device_info *cdi, struct file *fp); -extern int cdrom_ioctl(struct cdrom_device_info *cdi, struct inode *ip, - unsigned int cmd, unsigned long arg); +extern int cdrom_ioctl(struct file *file, struct cdrom_device_info *cdi, + struct inode *ip, unsigned int cmd, unsigned long arg); extern int cdrom_media_changed(struct cdrom_device_info *); extern int register_cdrom(struct cdrom_device_info *cdi); diff --git a/include/linux/ide.h b/include/linux/ide.h index fe54e41439c8..06542968a2c2 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1194,7 +1194,7 @@ typedef struct ide_driver_s { #define DRIVER(drive) ((drive)->driver) -extern int generic_ide_ioctl(struct block_device *, unsigned, unsigned long); +extern int generic_ide_ioctl(struct file *, struct block_device *, unsigned, unsigned long); /* * ide_hwifs[] is the master data structure used to keep track |