login
Search
On Wed, 27 Aug 2008, Linus Torvalds wrote:What the hell. Here's a test patch. A largish part of it was generated through a stupid script that basically did a number of grep + 'sed' on a lot of files, and then the rest was fixed up manually after running "make allmodconfig". I'm not going to guarantee anything, but it gets close. A starting point for somebody else, and considering that it is 208 files changed, 370 insertions(+), 376 deletions(-) this is definitely linux-next material. The extra deletions are mainly because the passing of "inode" as an argument means that some functions don't need to look it up manually any more. And yeah, I changed the return type to "int". There's no way the kernel can validly return anything bigger than that anyway. And this way all the ioctl functions have the same type, no confusion. TOTALLY UNTESTED apart from the fact that it compiles. Linus --- arch/mips/sibyte/common/sb_tbprof.c | 2 +- arch/parisc/kernel/perf.c | 4 +- arch/sparc/kernel/apc.c | 2 +- arch/x86/kernel/apm_32.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +- arch/x86/kernel/cpu/mtrr/if.c | 3 +- block/bsg.c | 2 +- block/compat_ioctl.c | 18 +++++++++++----- block/ioctl.c | 3 +- drivers/block/DAC960.c | 2 +- drivers/block/cciss.c | 4 +- drivers/block/loop.c | 3 +- drivers/block/paride/pt.c | 4 +- drivers/char/agp/agp.h | 2 +- drivers/char/agp/compat_ioctl.c | 2 +- drivers/char/agp/frontend.c | 2 +- drivers/char/ds1302.c | 2 +- drivers/char/dsp56k.c | 2 +- drivers/char/efirtc.c | 4 +- drivers/char/ip2/ip2main.c | 6 ++-- drivers/char/ip27-rtc.c | 4 +- drivers/char/ipmi/ipmi_devintf.c | 2 +- drivers/char/mmtimer.c | 4 +- drivers/char/mwave/mwavedd.c | 4 +- drivers/char/pcmcia/cm4000_cs.c | 3 +- drivers/char/ppdev.c | 2 +- drivers/char/random.c | 2 +- drivers/char/rio/rio_linux.c | 4 +- drivers/char/rtc.c | 4 +- drivers/char/sx.c | 4 +- drivers/char/tty_io.c | 14 +++++------- drivers/char/viotape.c | 2 +- drivers/firewire/fw-cdev.c | 8 +++--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_ioc32.c | 2 +- drivers/gpu/drm/mga/mga_drv.h | 2 +- drivers/gpu/drm/mga/mga_ioc32.c | 2 +- drivers/gpu/drm/r128/r128_drv.h | 2 +- drivers/gpu/drm/r128/r128_ioc32.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.h | 2 +- drivers/gpu/drm/radeon/radeon_ioc32.c | 2 +- drivers/hid/hidraw.c | 3 +- drivers/hid/usbhid/hiddev.c | 6 ++-- drivers/i2c/i2c-dev.c | 2 +- drivers/ieee1394/dv1394.c | 20 +++++++++--------- drivers/ieee1394/raw1394.c | 4 +- drivers/ieee1394/video1394.c | 34 ++++++++++++++++---------------- drivers/infiniband/core/user_mad.c | 4 +- drivers/input/evdev.c | 4 +- drivers/input/joydev.c | 4 +- drivers/input/misc/uinput.c | 2 +- drivers/md/dm-ioctl.c | 6 ++-- drivers/media/video/compat_ioctl32.c | 26 ++++++++++++------------ drivers/message/fusion/mptctl.c | 8 +++--- drivers/message/i2o/i2o_config.c | 2 +- drivers/misc/phantom.c | 6 ++-- drivers/misc/sgi-gru/grufile.c | 2 +- drivers/net/ppp_generic.c | 2 +- drivers/pci/proc.c | 2 +- drivers/rtc/rtc-dev.c | 2 +- drivers/s390/block/dasd_int.h | 2 +- drivers/s390/char/tape_char.c | 2 +- drivers/s390/char/vmcp.c | 2 +- drivers/s390/cio/chsc_sch.c | 2 +- drivers/s390/crypto/zcrypt_api.c | 4 +- drivers/s390/scsi/zfcp_cfdc.c | 2 +- drivers/sbus/char/cpwatchdog.c | 2 +- drivers/sbus/char/display7seg.c | 2 +- drivers/sbus/char/openprom.c | 2 +- drivers/scsi/aacraid/linit.c | 2 +- drivers/scsi/ch.c | 6 ++-- drivers/scsi/dpt_i2o.c | 7 +---- drivers/scsi/megaraid/megaraid_mm.c | 10 ++++---- drivers/scsi/megaraid/megaraid_sas.c | 10 ++++---- drivers/scsi/osst.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/scsi/sg.c | 2 +- drivers/scsi/st.c | 4 +- drivers/spi/spidev.c | 4 +- drivers/telephony/ixj.c | 2 +- drivers/usb/class/usblp.c | 2 +- drivers/usb/gadget/inode.c | 6 ++-- drivers/usb/gadget/printer.c | 4 +- drivers/usb/misc/iowarrior.c | 2 +- drivers/usb/misc/rio500.c | 2 +- drivers/usb/misc/sisusbvga/sisusb.c | 10 ++++---- drivers/usb/misc/usblcd.c | 2 +- drivers/video/fbmem.c | 4 +-- drivers/watchdog/acquirewdt.c | 2 +- drivers/watchdog/advantechwdt.c | 2 +- drivers/watchdog/alim1535_wdt.c | 2 +- drivers/watchdog/alim7101_wdt.c | 2 +- drivers/watchdog/ar7_wdt.c | 2 +- drivers/watchdog/at32ap700x_wdt.c | 2 +- drivers/watchdog/at91rm9200_wdt.c | 2 +- drivers/watchdog/bfin_wdt.c | 2 +- drivers/watchdog/booke_wdt.c | 2 +- drivers/watchdog/cpu5wdt.c | 2 +- drivers/watchdog/davinci_wdt.c | 2 +- drivers/watchdog/ep93xx_wdt.c | 2 +- drivers/watchdog/eurotechwdt.c | 2 +- drivers/watchdog/hpwdt.c | 2 +- drivers/watchdog/i6300esb.c | 2 +- drivers/watchdog/iTCO_wdt.c | 2 +- drivers/watchdog/ib700wdt.c | 2 +- drivers/watchdog/ibmasr.c | 2 +- drivers/watchdog/indydog.c | 2 +- drivers/watchdog/iop_wdt.c | 2 +- drivers/watchdog/it8712f_wdt.c | 2 +- drivers/watchdog/ixp2000_wdt.c | 2 +- drivers/watchdog/ixp4xx_wdt.c | 2 +- drivers/watchdog/ks8695_wdt.c | 2 +- drivers/watchdog/machzwd.c | 2 +- drivers/watchdog/mixcomwd.c | 2 +- drivers/watchdog/mpc5200_wdt.c | 2 +- drivers/watchdog/mpc8xxx_wdt.c | 2 +- drivers/watchdog/mpcore_wdt.c | 2 +- drivers/watchdog/mtx-1_wdt.c | 2 +- drivers/watchdog/mv64x60_wdt.c | 2 +- drivers/watchdog/omap_wdt.c | 2 +- drivers/watchdog/pc87413_wdt.c | 2 +- drivers/watchdog/pcwd.c | 2 +- drivers/watchdog/pcwd_pci.c | 2 +- drivers/watchdog/pcwd_usb.c | 2 +- drivers/watchdog/pnx4008_wdt.c | 2 +- drivers/watchdog/rm9k_wdt.c | 4 +- drivers/watchdog/s3c2410_wdt.c | 2 +- drivers/watchdog/sa1100_wdt.c | 2 +- drivers/watchdog/sb_wdog.c | 2 +- drivers/watchdog/sbc60xxwdt.c | 2 +- drivers/watchdog/sbc7240_wdt.c | 2 +- drivers/watchdog/sbc_epx_c3.c | 2 +- drivers/watchdog/sc1200wdt.c | 2 +- drivers/watchdog/sc520_wdt.c | 2 +- drivers/watchdog/scx200_wdt.c | 2 +- drivers/watchdog/shwdt.c | 2 +- drivers/watchdog/smsc37b787_wdt.c | 2 +- drivers/watchdog/softdog.c | 2 +- drivers/watchdog/txx9wdt.c | 2 +- drivers/watchdog/w83627hf_wdt.c | 2 +- drivers/watchdog/w83697hf_wdt.c | 2 +- drivers/watchdog/w83877f_wdt.c | 2 +- drivers/watchdog/w83977f_wdt.c | 2 +- drivers/watchdog/wafer5823wdt.c | 2 +- drivers/watchdog/wdrtas.c | 2 +- drivers/watchdog/wdt.c | 2 +- drivers/watchdog/wdt285.c | 2 +- drivers/watchdog/wdt977.c | 2 +- drivers/watchdog/wdt_pci.c | 2 +- fs/bad_inode.c | 4 +- fs/block_dev.c | 7 +++++- fs/cifs/cifsfs.h | 2 +- fs/cifs/ioctl.c | 3 +- fs/compat_ioctl.c | 3 +- fs/ext2/ext2.h | 4 +- fs/ext2/ioctl.c | 7 ++--- fs/ext3/ioctl.c | 3 +- fs/ext4/ext4.h | 4 +- fs/ext4/ioctl.c | 7 ++--- fs/fat/dir.c | 3 +- fs/gfs2/ops_file.c | 2 +- fs/inotify_user.c | 2 +- fs/ioctl.c | 8 +++--- fs/jffs2/ioctl.c | 2 +- fs/jffs2/os-linux.h | 2 +- fs/jfs/ioctl.c | 7 ++--- fs/jfs/jfs_inode.h | 4 +- fs/ncpfs/ioctl.c | 3 +- fs/ocfs2/ioctl.c | 7 ++--- fs/ocfs2/ioctl.h | 4 +- fs/pipe.c | 3 +- fs/proc/inode.c | 14 ++++++------ fs/reiserfs/ioctl.c | 3 +- fs/ubifs/ioctl.c | 7 ++--- fs/ubifs/ubifs.h | 4 +- fs/xfs/linux-2.6/xfs_file.c | 8 +++--- fs/xfs/linux-2.6/xfs_ioctl32.c | 6 +++- fs/xfs/linux-2.6/xfs_ioctl32.h | 4 +- include/linux/ext3_fs.h | 2 +- include/linux/fs.h | 10 ++++---- include/linux/ncp_fs.h | 2 +- include/linux/reiserfs_fs.h | 2 +- include/linux/tty.h | 2 +- include/linux/wanrouter.h | 2 +- include/media/v4l2-ioctl.h | 2 +- kernel/power/user.c | 2 +- net/irda/irnet/irnet_ppp.c | 3 +- net/irda/irnet/irnet_ppp.h | 5 ++- net/socket.c | 8 +++--- net/wanrouter/wanmain.c | 3 +- sound/core/control.c | 2 +- sound/core/control_compat.c | 4 +- sound/core/hwdep.c | 2 +- sound/core/hwdep_compat.c | 4 +- sound/core/info.c | 2 +- sound/core/init.c | 2 +- sound/core/oss/mixer_oss.c | 2 +- sound/core/oss/pcm_oss.c | 2 +- sound/core/pcm_compat.c | 2 +- sound/core/pcm_native.c | 4 +- sound/core/rawmidi.c | 2 +- sound/core/rawmidi_compat.c | 4 +- sound/core/seq/oss/seq_oss.c | 6 ++-- sound/core/seq/seq_clientmgr.c | 2 +- sound/core/seq/seq_compat.c | 2 +- sound/core/timer.c | 2 +- sound/core/timer_compat.c | 4 +- virt/kvm/kvm_main.c | 8 +++--- 208 files changed, 370 insertions(+), 376 deletions(-) diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c index 66e3e3f..5419f85 100644 --- a/arch/mips/sibyte/common/sb_tbprof.c +++ b/arch/mips/sibyte/common/sb_tbprof.c @@ -507,7 +507,7 @@ static ssize_t sbprof_tb_read(struct file *filp, char *buf, return count; } -static long sbprof_tb_ioctl(struct file *filp, +static int sbprof_tb_ioctl(struct inode *inode, struct file *filp, unsigned int command, unsigned long arg) { diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c index f696f57..6d98acc 100644 --- a/arch/parisc/kernel/perf.c +++ b/arch/parisc/kernel/perf.c @@ -198,7 +198,7 @@ static int perf_open(struct inode *inode, struct file *file); static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t *ppos); static ssize_t perf_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos); -static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +static int perf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); static void perf_start_counters(void); static int perf_stop_counters(uint32_t *raddr); static const struct rdr_tbl_ent * perf_rdr_get_entry(uint32_t rdr_num); @@ -442,7 +442,7 @@ static void perf_patch_images(void) * must be running on the processor that you wish to change. */ -static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int perf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { long error_start; uint32_t raddr[4]; diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c index 5267d48..d49a35a 100644 --- a/arch/sparc/kernel/apc.c +++ b/arch/sparc/kernel/apc.c @@ -85,7 +85,7 @@ static int apc_release(struct inode *inode, struct file *f) return 0; } -static long apc_ioctl(struct file *f, unsigned int cmd, unsigned long __arg) +static int apc_ioctl(struct inode *inode, struct file *f, unsigned int cmd, unsigned long __arg) { __u8 inarg, __user *arg; diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 9ee24e6..329e4c5 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -1460,7 +1460,7 @@ static unsigned int do_poll(struct file *fp, poll_table *wait) return 0; } -static long do_ioctl(struct file *filp, u_int cmd, u_long arg) +static int do_ioctl(struct inode *inode, struct file *filp, u_int cmd, u_long arg) { struct apm_user *as; int ret; diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index 726a5fc..91f970f 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -645,7 +645,7 @@ static unsigned int mce_poll(struct file *file, poll_table *wait) return 0; } -static long mce_ioctl(struct file *f, unsigned int cmd, unsigned long arg) +static int mce_ioctl(struct inode *inode, struct file *f, unsigned int cmd, unsigned long arg) { int __user *p = (int __user *)arg; diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c index 84c480b..d6b053b 100644 --- a/arch/x86/kernel/cpu/mtrr/if.c +++ b/arch/x86/kernel/cpu/mtrr/if.c @@ -145,8 +145,7 @@ mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos) return -EINVAL; } -static long -mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) +static int mtrr_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long __arg) { int err = 0; mtrr_type type; diff --git a/block/bsg.c b/block/bsg.c index 0aae8d7..1ec2e02 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -872,7 +872,7 @@ static unsigned int bsg_poll(struct file *file, poll_table *wait) return mask; } -static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int bsg_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct bsg_device *bd = file->private_data; int __user *uarg = (int __user *) arg; diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index c23177e..2c32818 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -709,7 +709,7 @@ static int compat_blkdev_driver_ioctl(struct inode *inode, struct file *file, } if (disk->fops->unlocked_ioctl) - return disk->fops->unlocked_ioctl(file, cmd, arg); + return disk->fops->unlocked_ioctl(inode, file, cmd, arg); if (disk->fops->ioctl) { lock_kernel(); @@ -773,10 +773,16 @@ static int compat_blkdev_locked_ioctl(struct inode *inode, struct file *file, return -ENOIOCTLCMD; } -/* Most of the generic ioctls are handled in the normal fallback path. - This assumes the blkdev's low level compat_ioctl always returns - ENOIOCTLCMD for unknown ioctls. */ -long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) +/* + * Most of the generic ioctls are handled in the normal fallback path. + * This assumes the blkdev's low level compat_ioctl always returns + * ENOIOCTLCMD for unknown ioctls. + * + * NOTE! We ignore the on-disk inode that was passed as + * an argument, and use the "f_mapping->host" inode for + * all block ioctls! + */ +int compat_blkdev_ioctl(struct inode *unused, struct file *file, unsigned cmd, unsigned long arg) { int ret = -ENOIOCTLCMD; struct inode *inode = file->f_mapping->host; @@ -806,7 +812,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) ret = compat_blkdev_locked_ioctl(inode, file, bdev, cmd, arg); /* FIXME: why do we assume -> compat_ioctl needs the BKL? */ if (ret == -ENOIOCTLCMD && disk->fops->compat_ioctl) - ret = disk->fops->compat_ioctl(file, cmd, arg); + ret = disk->fops->compat_ioctl(inode, file, cmd, arg); unlock_kernel(); if (ret != -ENOIOCTLCMD) diff --git a/block/ioctl.c b/block/ioctl.c index 77185e5..a85824e 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -204,8 +204,9 @@ int blkdev_driver_ioctl(struct inode *inode, struct file *file, struct gendisk *disk, unsigned cmd, unsigned long arg) { int ret; + if (disk->fops->unlocked_ioctl) - return disk->fops->unlocked_ioctl(file, cmd, arg); + return disk->fops->unlocked_ioctl(inode, file, cmd, arg); if (disk->fops->ioctl) { lock_kernel(); diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index a002a38..972539d 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -6628,7 +6628,7 @@ static void DAC960_DestroyProcEntries(DAC960_Controller_T *Controller) * DAC960_gam_ioctl is the ioctl function for performing RAID operations. */ -static long DAC960_gam_ioctl(struct file *file, unsigned int Request, +static int DAC960_gam_ioctl(struct inode *inode, struct file *file, unsigned int Request, unsigned long Argument) { long ErrorCode = 0; diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index b73116e..67404dd 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -192,7 +192,7 @@ static void cciss_procinit(int i) #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_COMPAT -static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg); +static int cciss_compat_ioctl(struct inode *inode, struct file *f, unsigned cmd, unsigned long arg); #endif static struct block_device_operations cciss_fops = { @@ -618,7 +618,7 @@ static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, static int cciss_ioctl32_big_passthru(struct file *f, unsigned cmd, unsigned long arg); -static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg) +static int cciss_compat_ioctl(struct inode *inode, struct file *f, unsigned cmd, unsigned long arg) { switch (cmd) { case CCISS_GETPCIINFO: diff --git a/drivers/block/loop.c b/drivers/block/loop.c index d3a25b0..bfa4f44 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1292,9 +1292,8 @@ loop_get_status_compat(struct loop_device *lo, return err; } -static long lo_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int lo_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - struct inode *inode = file->f_path.dentry->d_inode; struct loop_device *lo = inode->i_bdev->bd_disk->private_data; int err; diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index 673b8b2..5a6fe4a 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c @@ -190,7 +190,7 @@ module_param_array(drive3, int, NULL, 0); #define ATAPI_LOG_SENSE 0x4d static int pt_open(struct inode *inode, struct file *file); -static long pt_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +static int pt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); static int pt_release(struct inode *inode, struct file *file); static ssize_t pt_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos); @@ -690,7 +690,7 @@ out: return err; } -static long pt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int pt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct pt_unit *tape = file->private_data; struct mtop __user *p = (void __user *)arg; diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 4bada0e..acdeee0 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h @@ -313,7 +313,7 @@ extern const struct aper_size_info_16 agp3_generic_sizes[]; extern int agp_off; extern int agp_try_unsupported_boot; -long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +int compat_agp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); /* Chipset independant registers (from AGP Spec) */ #define AGP_APBASE 0x10 diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c index 58c57cb..abd8974 100644 --- a/drivers/char/agp/compat_ioctl.c +++ b/drivers/char/agp/compat_ioctl.c @@ -202,7 +202,7 @@ static int compat_agpioc_unbind_wrap(struct agp_file_private *priv, void __user return agp_unbind_memory(memory); } -long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +int compat_agp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct agp_file_private *curr_priv = file->private_data; int ret_val = -ENOTTY; diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c index a96f319..0a2d134 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c @@ -971,7 +971,7 @@ int agpioc_chipset_flush_wrap(struct agp_file_private *priv) return 0; } -static long agp_ioctl(struct file *file, +static int agp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct agp_file_private *curr_priv = file->private_data; diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c index c5e67a6..95aac80 100644 --- a/drivers/char/ds1302.c +++ b/drivers/char/ds1302.c @@ -154,7 +154,7 @@ static unsigned char days_in_mo[] = /* ioctl that supports RTC_RD_TIME and RTC_SET_TIME (read and set time/date). */ -static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { unsigned long flags; diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c index ca7c72a..e4866bc 100644 --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c @@ -303,7 +303,7 @@ static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t co } } -static long dsp56k_ioctl(struct file *file, unsigned int cmd, +static int dsp56k_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { int dev = iminor(file->f_path.dentry->d_inode) & 0x0f; diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c index 34d15d5..3131dc0 100644 --- a/drivers/char/efirtc.c +++ b/drivers/char/efirtc.c @@ -51,7 +51,7 @@ static DEFINE_SPINLOCK(efi_rtc_lock); -static long efi_rtc_ioctl(struct file *file, unsigned int cmd, +static int efi_rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); #define is_leap(year) \ @@ -146,7 +146,7 @@ convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime) } } -static long efi_rtc_ioctl(struct file *file, unsigned int cmd, +static int efi_rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 689f9dc..5ac4c8d 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c @@ -203,7 +203,7 @@ static int set_serial_info(i2ChanStrPtr, struct serial_struct __user *); static ssize_t ip2_ipl_read(struct file *, char __user *, size_t, loff_t *); static ssize_t ip2_ipl_write(struct file *, const char __user *, size_t, loff_t *); -static long ip2_ipl_ioctl(struct file *, UINT, ULONG); +static int ip2_ipl_ioctl(struct inode *inode, struct file *, UINT, ULONG); static int ip2_ipl_open(struct inode *, struct file *); static int DumpTraceBuffer(char __user *, int); @@ -2845,8 +2845,8 @@ ip2_ipl_write(struct file *pFile, const char __user *pData, size_t count, loff_t /* */ /* */ /******************************************************************************/ -static long -ip2_ipl_ioctl (struct file *pFile, UINT cmd, ULONG arg ) +static int +ip2_ipl_ioctl(struct inode *inode, struct file *pFile, UINT cmd, ULONG arg ) { unsigned int iplminor = iminor(pFile->f_path.dentry->d_inode); int rc = 0; diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c index ec9d044..f85a353 100644 --- a/drivers/char/ip27-rtc.c +++ b/drivers/char/ip27-rtc.c @@ -47,7 +47,7 @@ #include <asm/sn/sn0/hub.h> #include <asm/sn/sn_private.h> -static long rtc_ioctl(struct file *filp, unsigned int cmd, +static int rtc_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static int rtc_read_proc(char *page, char **start, off_t off, @@ -76,7 +76,7 @@ static unsigned long epoch = 1970; /* year corresponding to 0x00 */ static const unsigned char days_in_mo[] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +static int rtc_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { struct rtc_time wtime; diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c index 64e1c16..02a8511 100644 --- a/drivers/char/ipmi/ipmi_devintf.c +++ b/drivers/char/ipmi/ipmi_devintf.c @@ -762,7 +762,7 @@ static long put_compat_ipmi_recv(struct ipmi_recv *p64, /* * Handle compatibility ioctls */ -static long compat_ipmi_ioctl(struct file *filep, unsigned int cmd, +static int compat_ipmi_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, unsigned long arg) { int rc; diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index 918711a..e2b2463 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c @@ -58,7 +58,7 @@ extern unsigned long sn_rtc_cycles_per_second; #define rtc_time() (*RTC_COUNTER_ADDR) -static long mmtimer_ioctl(struct file *file, unsigned int cmd, +static int mmtimer_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); static int mmtimer_mmap(struct file *file, struct vm_area_struct *vma); @@ -365,7 +365,7 @@ restart: * %MMTIMER_GETCOUNTER - Gets the current value in the counter and places it * in the address specified by @arg. */ -static long mmtimer_ioctl(struct file *file, unsigned int cmd, +static int mmtimer_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { int ret = 0; diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c index 4f8d67f..41a3af0 100644 --- a/drivers/char/mwave/mwavedd.c +++ b/drivers/char/mwave/mwavedd.c @@ -86,7 +86,7 @@ module_param(mwave_uart_io, int, 0); static int mwave_open(struct inode *inode, struct file *file); static int mwave_close(struct inode *inode, struct file *file); -static long mwave_ioctl(struct file *filp, unsigned int iocmd, +static int mwave_ioctl(struct inode *inode, struct file *filp, unsigned int iocmd, unsigned long ioarg); MWAVE_DEVICE_DATA mwave_s_mdd; @@ -119,7 +119,7 @@ static int mwave_close(struct inode *inode, struct file *file) return retval; } -static long mwave_ioctl(struct file *file, unsigned int iocmd, +static int mwave_ioctl(struct inode *inode, struct file *file, unsigned int iocmd, unsigned long ioarg) { unsigned int retval = 0; diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index f070ae7..f556c56 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c @@ -1406,11 +1406,10 @@ static void stop_monitor(struct cm4000_dev *dev) DEBUGP(3, dev, "<- stop_monitor\n"); } -static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { struct cm4000_dev *dev = filp->private_data; unsigned int iobase = dev->p_dev->io.BasePort1; - struct inode *inode = filp->f_path.dentry->d_inode; struct pcmcia_device *link; int size; int rc; diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index bee39fd..fafcc15 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -633,7 +633,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return 0; } -static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int pp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { long ret; lock_kernel(); diff --git a/drivers/char/random.c b/drivers/char/random.c index 1838aa3..93e26d0 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1061,7 +1061,7 @@ static ssize_t random_write(struct file *file, const char __user *buffer, return (ssize_t)count; } -static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg) +static int random_ioctl(struct inode *inode, struct file *f, unsigned int cmd, unsigned long arg) { int size, ent_count; int __user *p = (int __user *)arg; diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index a8f68a3..1fad0e4 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c @@ -179,7 +179,7 @@ static int rio_set_real_termios(void *ptr); static void rio_hungup(void *ptr); static void rio_close(void *ptr); static int rio_chars_in_buffer(void *ptr); -static long rio_fw_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +static int rio_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static int rio_init_drivers(void); static void my_hd(void *addr, int len); @@ -560,7 +560,7 @@ static void rio_close(void *ptr) -static long rio_fw_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +static int rio_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { int rc = 0; func_enter(); diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index f53d4d0..3bb7b51 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -142,7 +142,7 @@ static DEFINE_TIMER(rtc_irq_timer, rtc_dropped_irq, 0, 0); static ssize_t rtc_read(struct file *file, char __user *buf, size_t count, loff_t *ppos); -static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); static void rtc_get_rtc_time(struct rtc_time *rtc_tm); #ifdef RTC_IRQ @@ -717,7 +717,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel) &wtime, sizeof wtime) ? -EFAULT : 0; } -static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { long ret; lock_kernel(); diff --git a/drivers/char/sx.c b/drivers/char/sx.c index c385206..54d0c48 100644 --- a/drivers/char/sx.c +++ b/drivers/char/sx.c @@ -286,7 +286,7 @@ static void sx_close(void *ptr); static int sx_chars_in_buffer(void *ptr); static int sx_init_board(struct sx_board *board); static int sx_init_portstructs(int nboards, int nports); -static long sx_fw_ioctl(struct file *filp, unsigned int cmd, +static int sx_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static int sx_init_drivers(void); @@ -1686,7 +1686,7 @@ static int do_memtest_w(struct sx_board *board, int min, int max) } #endif -static long sx_fw_ioctl(struct file *filp, unsigned int cmd, +static int sx_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { long rc = 0; diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index daeb8f7..835658b 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -150,9 +150,9 @@ ssize_t redirected_tty_write(struct file *, const char __user *, static unsigned int tty_poll(struct file *, poll_table *); static int tty_open(struct inode *, struct file *); static int tty_release(struct inode *, struct file *); -long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); #ifdef CONFIG_COMPAT -static long tty_compat_ioctl(struct file *file, unsigned int cmd, +static int tty_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); #else #define tty_compat_ioctl NULL @@ -785,13 +785,13 @@ static unsigned int hung_up_tty_poll(struct file *filp, poll_table *wait) return POLLIN | POLLOUT | POLLERR | POLLHUP | POLLRDNORM | POLLWRNORM; } -static long hung_up_tty_ioctl(struct file *file, unsigned int cmd, +static int hung_up_tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { return cmd == TIOCSPGRP ? -ENOTTY : -EIO; } -static long hung_up_tty_compat_ioctl(struct file *file, +static int hung_up_tty_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { return cmd == TIOCSPGRP ? -ENOTTY : -EIO; @@ -2941,13 +2941,12 @@ static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int /* * Split this up, as gcc can choke on it otherwise.. */ -long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct tty_struct *tty, *real_tty; void __user *p = (void __user *)arg; int retval; struct tty_ldisc *ld; - struct inode *inode = file->f_dentry->d_inode; tty = (struct tty_struct *)file->private_data; if (tty_paranoia_check(tty, inode, "tty_ioctl")) @@ -3075,10 +3074,9 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) } #ifdef CONFIG_COMPAT -static long tty_compat_ioctl(struct file *file, unsigned int cmd, +static int tty_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - struct inode *inode = file->f_dentry->d_inode; struct tty_struct *tty = file->private_data; struct tty_ldisc *ld; int retval = -ENOIOCTLCMD; diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 7a70a40..649b50e 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c @@ -678,7 +678,7 @@ free_op: return ret; } -static long viotap_unlocked_ioctl(struct file *file, +static int viotap_unlocked_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { long rc; diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c index 2e6d584..c7b1e3d 100644 --- a/drivers/firewire/fw-cdev.c +++ b/drivers/firewire/fw-cdev.c @@ -916,8 +916,8 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg) return 0; } -static long -fw_device_op_ioctl(struct file *file, +static int +fw_device_op_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct client *client = file->private_data; @@ -929,8 +929,8 @@ fw_device_op_ioctl(struct file *file, } #ifdef CONFIG_COMPAT -static long -fw_device_op_compat_ioctl(struct file *file, +static int +fw_device_op_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct client *client = file->private_data; diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d7326d9..ecc9ce6 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -216,7 +216,7 @@ extern void i915_driver_lastclose(struct drm_device * dev); extern void i915_driver_preclose(struct drm_device *dev, struct drm_file *file_priv); extern int i915_driver_device_is_agp(struct drm_device * dev); -extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, +extern int i915_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); /* i915_irq.c */ diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c index 1fe68a2..f8f623e 100644 --- a/drivers/gpu/drm/i915/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c @@ -199,7 +199,7 @@ drm_ioctl_compat_t *i915_compat_ioctls[] = { * \param arg user argument. * \return zero on success or negative number on failure. */ -long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +int i915_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { unsigned int nr = DRM_IOCTL_NR(cmd); drm_ioctl_compat_t *fn = NULL; diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h index f6ebd24..dfe6cd7 100644 --- a/drivers/gpu/drm/mga/mga_drv.h +++ b/drivers/gpu/drm/mga/mga_drv.h @@ -187,7 +187,7 @@ extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS); extern void mga_driver_irq_preinstall(struct drm_device * dev); extern void mga_driver_irq_postinstall(struct drm_device * dev); extern void mga_driver_irq_uninstall(struct drm_device * dev); -extern long mga_compat_ioctl(struct file *filp, unsigned int cmd, +extern int mga_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); #define mga_flush_write_combine() DRM_WRITEMEMORYBARRIER() diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c index 30d0047..b5d0826 100644 --- a/drivers/gpu/drm/mga/mga_ioc32.c +++ b/drivers/gpu/drm/mga/mga_ioc32.c @@ -208,7 +208,7 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = { * \param arg user argument. * \return zero on success or negative number on failure. */ -long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +int mga_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { unsigned int nr = DRM_IOCTL_NR(cmd); drm_ioctl_compat_t *fn = NULL; diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h index 011105e..e145952 100644 --- a/drivers/gpu/drm/r128/r128_drv.h +++ b/drivers/gpu/drm/r128/r128_drv.h @@ -159,7 +159,7 @@ extern void r128_driver_lastclose(struct drm_device * dev); extern void r128_driver_preclose(struct drm_device * dev, struct drm_file *file_priv); -extern long r128_compat_ioctl(struct file *filp, unsigned int cmd, +extern int r128_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); /* Register definitions, register access macros and drmAddMap constants diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c index d3cb676..f242fdb 100644 --- a/drivers/gpu/drm/r128/r128_ioc32.c +++ b/drivers/gpu/drm/r128/r128_ioc32.c @@ -198,7 +198,7 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = { * \param arg user argument. * \return zero on success or negative number on failure. */ -long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +int r128_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { unsigned int nr = DRM_IOCTL_NR(cmd); drm_ioctl_compat_t *fn = NULL; diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 0993816..4b55abd 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -401,7 +401,7 @@ extern void radeon_driver_preclose(struct drm_device * dev, struct drm_file *fil extern void radeon_driver_postclose(struct drm_device * dev, struct drm_file * filp); extern void radeon_driver_lastclose(struct drm_device * dev); extern int radeon_driver_open(struct drm_device * dev, struct drm_file * filp_priv); -extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd, +extern int radeon_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); /* r300_cmdbuf.c */ diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c index 56decda..6b518cb 100644 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c @@ -401,7 +401,7 @@ drm_ioctl_compat_t *radeon_compat_ioctls[] = { * \param arg user argument. * \return zero on success or negative number on failure. */ -long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +int radeon_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { unsigned int nr = DRM_IOCTL_NR(cmd); drm_ioctl_compat_t *fn = NULL; diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index c40f040..0a15260 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -217,10 +217,9 @@ static int hidraw_release(struct inode * inode, struct file * file) return 0; } -static long hidraw_ioctl(struct file *file, unsigned int cmd, +static int hidraw_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - struct inode *inode = file->f_path.dentry->d_inode; unsigned int minor = iminor(inode); long ret = 0; /* FIXME: What stops hidraw_table going NULL */ diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 842e9ed..0b08caf 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -544,7 +544,7 @@ static noinline int hiddev_ioctl_string(struct hiddev *hiddev, unsigned int cmd, return len; } -static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct hiddev_list *list = file->private_data; struct hiddev *hiddev = list->hiddev; @@ -761,9 +761,9 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) } #ifdef CONFIG_COMPAT -static long hiddev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int hiddev_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - return hiddev_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); + return hiddev_ioctl(inode, file, cmd, (unsigned long)compat_ptr(arg)); } #endif diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index af4491f..98ec3d2 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -367,7 +367,7 @@ static noinline int i2cdev_ioctl_smbus(struct i2c_client *client, return res; } -static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int i2cdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct i2c_client *client = (struct i2c_client *)file->private_data; unsigned long funcs; diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index b6eb2cf..a8bdc2c 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c @@ -158,7 +158,7 @@ static void it_tasklet_func(unsigned long data); static void ir_tasklet_func(unsigned long data); #ifdef CONFIG_COMPAT -static long dv1394_compat_ioctl(struct file *file, unsigned int cmd, +static int dv1394_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); #endif @@ -1533,7 +1533,7 @@ static ssize_t dv1394_read(struct file *file, char __user *buffer, size_t count /*** DEVICE IOCTL INTERFACE ************************************************/ -static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int dv1394_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct video_card *video = file_to_video_card(file); unsigned long flags; @@ -2457,7 +2457,7 @@ struct dv1394_status32 { /* RED-PEN: this should use compat_alloc_userspace instead */ -static int handle_dv1394_init(struct file *file, unsigned int cmd, unsigned long arg) +static int handle_dv1394_init(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct dv1394_init32 dv32; struct dv1394_init dv; @@ -2480,13 +2480,13 @@ static int handle_dv1394_init(struct file *file, unsigned int cmd, unsigned long old_fs = get_fs(); set_fs(KERNEL_DS); - ret = dv1394_ioctl(file, DV1394_IOC_INIT, (unsigned long)&dv); + ret = dv1394_ioctl(inode, file, DV1394_IOC_INIT, (unsigned long)&dv); set_fs(old_fs); return ret; } -static int handle_dv1394_get_status(struct file *file, unsigned int cmd, unsigned long arg) +static int handle_dv1394_get_status(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct dv1394_status32 dv32; struct dv1394_status dv; @@ -2498,7 +2498,7 @@ static int handle_dv1394_get_status(struct file *file, unsigned int cmd, unsigne old_fs = get_fs(); set_fs(KERNEL_DS); - ret = dv1394_ioctl(file, DV1394_IOC_GET_STATUS, (unsigned long)&dv); + ret = dv1394_ioctl(inode, file, DV1394_IOC_GET_STATUS, (unsigned long)&dv); set_fs(old_fs); if (!ret) { @@ -2523,7 +2523,7 @@ static int handle_dv1394_get_status(struct file *file, unsigned int cmd, unsigne -static long dv1394_compat_ioctl(struct file *file, unsigned int cmd, +static int dv1394_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { switch (cmd) { @@ -2532,12 +2532,12 @@ static long dv1394_compat_ioctl(struct file *file, unsigned int cmd, case DV1394_IOC_WAIT_FRAMES: case DV1394_IOC_RECEIVE_FRAMES: case DV1394_IOC_START_RECEIVE: - return dv1394_ioctl(file, cmd, arg); + return dv1394_ioctl(inode, file, cmd, arg); case DV1394_IOC32_INIT: - return handle_dv1394_init(file, cmd, arg); + return handle_dv1394_init(inode, file, cmd, arg); case DV1394_IOC32_GET_STATUS: - return handle_dv1394_get_status(file, cmd, arg); + return handle_dv1394_get_status(inode, file, cmd, arg); default: return -ENOIOCTLCMD; } diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index 6fa9e4a..6cf46fa 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c @@ -2656,7 +2656,7 @@ static long do_raw1394_ioctl(struct file *file, unsigned int cmd, return -EINVAL; } -static long raw1394_ioctl(struct file *file, unsigned int cmd, +static int raw1394_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { long ret; @@ -2717,7 +2717,7 @@ static long raw1394_read_cycle_timer32(struct file_info *fi, void __user * uaddr return err; } -static long raw1394_compat_ioctl(struct file *file, +static int raw1394_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct file_info *fi = file->private_data; diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 25db6e6..ed4eb78 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -716,7 +716,7 @@ static inline unsigned video1394_buffer_state(struct dma_iso_ctx *d, return ret; } -static long video1394_ioctl(struct file *file, +static int video1394_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct file_ctx *ctx = (struct file_ctx *)file->private_data; @@ -1272,7 +1272,7 @@ static int video1394_release(struct inode *inode, struct file *file) } #ifdef CONFIG_COMPAT -static long video1394_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg); +static int video1394_compat_ioctl(struct inode *inode, struct file *f, unsigned cmd, unsigned long arg); #endif static struct cdev video1394_cdev; @@ -1386,7 +1386,7 @@ struct video1394_wait32 { struct compat_timeval filltime; }; -static int video1394_wr_wait32(struct file *file, unsigned int cmd, unsigned long arg) +static int video1394_wr_wait32(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct video1394_wait32 __user *argp = (void __user *)arg; struct video1394_wait32 wait32; @@ -1405,11 +1405,11 @@ static int video1394_wr_wait32(struct file *file, unsigned int cmd, unsigned lon old_fs = get_fs(); set_fs(KERNEL_DS); if (cmd == VIDEO1394_IOC32_LISTEN_WAIT_BUFFER) - ret = video1394_ioctl(file, + ret = video1394_ioctl(inode, file, VIDEO1394_IOC_LISTEN_WAIT_BUFFER, (unsigned long) &wait); else - ret = video1394_ioctl(file, + ret = video1394_ioctl(inode, file, VIDEO1394_IOC_LISTEN_POLL_BUFFER, (unsigned long) &wait); set_fs(old_fs); @@ -1427,7 +1427,7 @@ static int video1394_wr_wait32(struct file *file, unsigned int cmd, unsigned lon return ret; } -static int video1394_w_wait32(struct file *file, unsigned int cmd, unsigned long arg) +static int video1394_w_wait32(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct video1394_wait32 wait32; struct video1394_wait wait; @@ -1445,11 +1445,11 @@ static int video1394_w_wait32(struct file *file, unsigned int cmd, unsigned long old_fs = get_fs(); set_fs(KERNEL_DS); if (cmd == VIDEO1394_IOC32_LISTEN_QUEUE_BUFFER) - ret = video1394_ioctl(file, + ret = video1394_ioctl(inode, file, VIDEO1394_IOC_LISTEN_QUEUE_BUFFER, (unsigned long) &wait); else - ret = video1394_ioctl(file, + ret = video1394_ioctl(inode, file, VIDEO1394_IOC_TALK_WAIT_BUFFER, (unsigned long) &wait); set_fs(old_fs); @@ -1457,33 +1457,33 @@ static int video1394_w_wait32(struct file *file, unsigned int cmd, unsigned long return ret; } -static int video1394_queue_buf32(struct file *file, unsigned int cmd, unsigned long arg) +static int video1394_queue_buf32(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { return -EFAULT; /* ??? was there before. */ - return video1394_ioctl(file, + return video1394_ioctl(inode, file, VIDEO1394_IOC_TALK_QUEUE_BUFFER, arg); } -static long video1394_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg) +static int video1394_compat_ioctl(struct inode *inode, struct file *f, unsigned cmd, unsigned long arg) { switch (cmd) { case VIDEO1394_IOC_LISTEN_CHANNEL: case VIDEO1394_IOC_UNLISTEN_CHANNEL: case VIDEO1394_IOC_TALK_CHANNEL: case VIDEO1394_IOC_UNTALK_CHANNEL: - return video1394_ioctl(f, cmd, arg); + return video1394_ioctl(inode, f, cmd, arg); case VIDEO1394_IOC32_LISTEN_QUEUE_BUFFER: - return video1394_w_wait32(f, cmd, arg); + return video1394_w_wait32(inode, f, cmd, arg); case VIDEO1394_IOC32_LISTEN_WAIT_BUFFER: - return video1394_wr_wait32(f, cmd, arg); + return video1394_wr_wait32(inode, f, cmd, arg); case VIDEO1394_IOC_TALK_QUEUE_BUFFER: - return video1394_queue_buf32(f, cmd, arg); + return video1394_queue_buf32(inode, f, cmd, arg); case VIDEO1394_IOC32_TALK_WAIT_BUFFER: - return video1394_w_wait32(f, cmd, arg); + return video1394_w_wait32(inode, f, cmd, arg); case VIDEO1394_IOC32_LISTEN_POLL_BUFFER: - return video1394_wr_wait32(f, cmd, arg); + return video1394_wr_wait32(inode, f, cmd, arg); default: return -ENOIOCTLCMD; } diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 268a2d2..6cd0bc3 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -743,7 +743,7 @@ static long ib_umad_enable_pkey(struct ib_umad_file *file) return ret; } -static long ib_umad_ioctl(struct file *filp, unsigned int cmd, +static int ib_umad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { switch (cmd) { @@ -759,7 +759,7 @@ static long ib_umad_ioctl(struct file *filp, unsigned int cmd, } #ifdef CONFIG_COMPAT -static long ib_umad_compat_ioctl(struct file *filp, unsigned int cmd, +static int ib_umad_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { switch (cmd) { diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 3524bef..9fd8fa9 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -888,13 +888,13 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, return retval; } -static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int evdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { return evdev_ioctl_handler(file, cmd, (void __user *)arg, 0); } #ifdef CONFIG_COMPAT -static long evdev_ioctl_compat(struct file *file, +static int evdev_ioctl_compat(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { return evdev_ioctl_handler(file, cmd, compat_ptr(arg), 1); diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 65d7077..d4db145 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -555,7 +555,7 @@ static int joydev_ioctl_common(struct joydev *joydev, } #ifdef CONFIG_COMPAT -static long joydev_compat_ioctl(struct file *file, +static int joydev_compat_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct joydev_client *client = file->private_data; @@ -622,7 +622,7 @@ static long joydev_compat_ioctl(struct file *file, } #endif /* CONFIG_COMPAT */ -static long joydev_ioctl(struct file *file, +static int joydev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct joydev_client *client = file->private_data; diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 223d56d..a37877e 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -455,7 +455,7 @@ static int uinput_release(struct inode *inode, struct file *file) __ret; \ }) -static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int uinput_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { int retval; struct uinput_device *udev; diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index b262c00..c21cbdc 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1470,15 +1470,15 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user) return r; } -static long dm_ctl_ioctl(struct file *file, uint command, ulong u) +static int dm_ctl_ioctl(struct inode *inode, struct file *file, uint command, ulong u) { return (long)ctl_ioctl(command, (struct dm_ioctl __user *)u); } #ifdef CONFIG_COMPAT -static long dm_compat_ctl_ioctl(struct file *file, uint command, ulong u) +static int dm_compat_ctl_ioctl(struct inode *inode, struct file *file, uint command, ulong u) { - return (long)dm_ctl_ioctl(file, command, (ulong) compat_ptr(u)); + return dm_ctl_ioctl(inode, file, command, (ulong) compat_ptr(u)); } #else #define dm_compat_ctl_ioctl NULL diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c index bd5d9de..7eacc2d 100644 --- a/drivers/media/video/compat_ioctl32.c +++ b/drivers/media/video/compat_ioctl32.c @@ -110,15 +110,15 @@ struct video_window32 { }; #endif -static int native_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int native_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { int ret = -ENOIOCTLCMD; if (file->f_op->unlocked_ioctl) - ret = file->f_op->unlocked_ioctl(file, cmd, arg); + ret = file->f_op->unlocked_ioctl(inode, file, cmd, arg); else if (file->f_op->ioctl) { lock_kernel(); - ret = file->f_op->ioctl(file->f_path.dentry->d_inode, file, cmd, arg); + ret = file->f_op->ioctl(inode, file, cmd, arg); unlock_kernel(); } @@ -549,7 +549,7 @@ enum { MaxClips = (~0U-sizeof(struct video_window))/sizeof(struct video_clip) }; -static int do_set_window(struct file *file, unsigned int cmd, unsigned long arg) +static int do_set_window(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct video_window32 __user *up = compat_ptr(arg); struct video_window __user *vw; @@ -607,11 +607,11 @@ static int do_set_window(struct file *file, unsigned int cmd, unsigned long arg) } } - return native_ioctl(file, VIDIOCSWIN, (unsigned long)vw); + return native_ioctl(inode, file, VIDIOCSWIN, (unsigned long)vw); } #endif -static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int do_video_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { union { #ifdef CONFIG_VIDEO_V4L1_COMPAT @@ -754,12 +754,12 @@ static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg goto out; if(compatible_arg) - err = native_ioctl(file, realcmd, (unsigned long)up); + err = native_ioctl(inode, file, realcmd, (unsigned long)up); else { mm_segment_t old_fs = get_fs(); set_fs(KERNEL_DS); - err = native_ioctl(file, realcmd, (unsigned long) &karg); + err = native_ioctl(inode, file, realcmd, (unsigned long) &karg); set_fs(old_fs); } if(err == 0) { @@ -827,7 +827,7 @@ out: return err; } -long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) +int v4l_compat_ioctl32(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { int ret = -ENOIOCTLCMD; @@ -837,7 +837,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) switch (cmd) { #ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCSWIN32: - ret = do_set_window(file, cmd, arg); + ret = do_set_window(inode, file, cmd, arg); break; case VIDIOCGTUNER32: case VIDIOCSTUNER32: @@ -885,7 +885,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) case VIDIOC_S_INPUT32: case VIDIOC_TRY_FMT32: case VIDIOC_S_HW_FREQ_SEEK: - ret = do_video_ioctl(file, cmd, arg); + ret = do_video_ioctl(inode, file, cmd, arg); break; #ifdef CONFIG_VIDEO_V4L1_COMPAT @@ -913,7 +913,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) case _IOR('v' , BASE_VIDIOCPRIVATE+5, int): case _IOR('v' , BASE_VIDIOCPRIVATE+6, int): case _IOR('v' , BASE_VIDIOCPRIVATE+7, int): - ret = native_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); + ret = native_ioctl(inode, file, cmd, (unsigned long)compat_ptr(arg)); break; #endif default: @@ -922,7 +922,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) return ret; } #else -long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) +int v4l_compat_ioctl32(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { return -ENOIOCTLCMD; } diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index f5233f3..3d20a3c 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c @@ -116,7 +116,7 @@ static int mptctl_probe(struct pci_dev *, const struct pci_device_id *); static void mptctl_remove(struct pci_dev *); #ifdef CONFIG_COMPAT -static long compat_mpctl_ioctl(struct file *f, unsigned cmd, unsigned long arg); +static int compat_mpctl_ioctl(struct inode *inode, struct file *f, unsigned cmd, unsigned long arg); #endif /* * Private function calls. @@ -652,8 +652,8 @@ __mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return ret; } -static long -mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int +mptctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { long ret; lock_kernel(); @@ -2818,7 +2818,7 @@ compat_mpt_command(struct file *filp, unsigned int cmd, return ret; } -static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long arg) +static int compat_mpctl_ioctl(struct inode *inode, struct file *f, unsigned int cmd, unsigned long arg) { long ret; lock_kernel(); diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 4238de9..442cdb3 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c @@ -746,7 +746,7 @@ out: return rcode; } -static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd, +static int i2o_cfg_compat_ioctl(struct inode *inode, struct file *file, unsigned cmd, unsigned long arg) { int ret; diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c index daf5856..4902f28 100644 --- a/drivers/misc/phantom.c +++ b/drivers/misc/phantom.c @@ -83,7 +83,7 @@ static int phantom_status(struct phantom_device *dev, unsigned long newstat) * File ops */ -static long phantom_ioctl(struct file *file, unsigned int cmd, +static int phantom_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct phantom_device *dev = file->private_data; @@ -195,14 +195,14 @@ static long phantom_ioctl(struct file *file, unsigned int cmd, } #ifdef CONFIG_COMPAT -static long phantom_compat_ioctl(struct file *filp, unsigned int cmd, +static int phantom_compat_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { if (_IOC_NR(cmd) <= 3 && _IOC_SIZE(cmd) == sizeof(compat_uptr_t)) { cmd &= ~(_IOC_SIZEMASK << _IOC_SIZESHIFT); cmd |= sizeof(void *) << _IOC_SIZESHIFT; } - return phantom_ioctl(filp, cmd, (unsigned long)compat_ptr(arg)); + return phantom_ioctl(inode, filp, cmd, (unsigned long)compat_ptr(arg)); } #else #define phantom_compat_ioctl NULL diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 23c91f5..fb6d7ad 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c @@ -233,7 +233,7 @@ static long gru_get_chiplet_status(unsigned long arg) * * Called to update file attributes via IOCTL calls. */ -static long gru_file_unlocked_ioctl(struct file *file, unsigned int req, +static int gru_file_unlocked_ioctl(struct inode *inode, struct file *file, unsigned int req, unsigned long arg) { int err = -EBADRQC; diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index ddccc07..3ec394d 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -547,7 +547,7 @@ static int get_filter(void __user *arg, struct sock_filter **p) } #endif /* CONFIG_PPP_FILTER */ -static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static int ppp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct ppp_file *pf = file->private_data; struct ppp *ppp; diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index e1098c3..db5903f 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c @@ -201,7 +201,7 @@ struct pci_filp_private { int write_combine; }; -static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, +static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { const struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
