v4l: Remove reference to bkl ioctl in compat ioctl handling
Subsystems (5)
PATCH 1/2 v4l: Remove reference to bkl ioctl in compat ioctl handling
There are no more users of struct file_operations:ioctl. These can be safely removed.
Signed-off-by Frederic Weisbecker <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc John Kacur <[email protected]>
Cc Hans Verkuil <[email protected]>
--- drivers/media/video/v4l2-compat-ioctl32.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
drivers/media/video/v4l2-compat-ioctl32.c +1 -6
@@ -228,11 +228,6 @@ static long native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)if (file->f_op->unlocked_ioctl) ret = file->f_op->unlocked_ioctl (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); -unlock_kernel (); - }return ret; }
@@ -973,7 +968,7 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) {long ret = -ENOIOCTLCMD ; -if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl) +if (!file->f_op->unlocked_ioctl)return ret;switch (cmd) {
Signature · 1 line
1.6.2.3
PATCH 2/2 bkl: Remove locked .ioctl file operation
From: Arnd Bergmann <[email protected]>
The last user is gone, so we can safely remove this
Signed-off-by Arnd Bergmann <[email protected]>
Cc John Kacur <[email protected]>
Cc Al Viro <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Frederic Weisbecker <[email protected]>
--- Documentation/filesystems/Locking | 8 +------- Documentation/filesystems/vfs.txt | 6 +----- fs/bad_inode.c | 7 ------- fs/compat_ioctl.c | 3 +-- fs/ioctl.c | 18 ++++-------------- fs/proc/inode.c | 17 ++++------------- include/linux/fs.h | 5 ++--- 7 files changed, 13 insertions(+), 51 deletions(-)
Documentation/filesystems/Locking +1 -7
@@ -374,8 +374,6 @@ prototypes: ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); int (*readdir) (struct file *, void *, filldir_t); unsigned int (*poll) (struct file *, struct poll_table_struct *); - int (*ioctl) (struct inode *, struct file *, unsigned int, - unsigned long); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *);
@@ -409,8 +407,7 @@ write: no aio_write: no readdir: no poll: no -ioctl: yes (see below) -unlocked_ioctl: no (see below) +unlocked_ioctl: no compat_ioctl: no mmap: no open: no
@@ -453,9 +450,6 @@ move ->readdir() to inode_operations and use a separate method for directory anything that resembles union-mount we won't have a struct file for all components. And there are other reasons why the current interface is a mess... -->ioctl() on regular files is superceded by the ->unlocked_ioctl() that -doesn't take the BKL. - ->read on directories probably must go away - we should just enforce -EISDIR in sys_read() and friends.
Documentation/filesystems/vfs.txt +1 -5
@@ -727,7 +727,6 @@ struct file_operations { ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); int (*readdir) (struct file *, void *, filldir_t); unsigned int (*poll) (struct file *, struct poll_table_struct *); - int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *);
@@ -768,10 +767,7 @@ otherwise noted. activity on this file and (optionally) go to sleep until there is activity. Called by the select(2) and poll(2) system calls - ioctl: called by the ioctl(2) system call - - unlocked_ioctl: called by the ioctl(2) system call. Filesystems that do not - require the BKL should use this method instead of the ioctl() above. + unlocked_ioctl: called by the ioctl(2) system call. compat_ioctl: called by the ioctl(2) system call when 32 bit system calls are used on 64 bit kernels.
fs/bad_inode.c +0 -7
@@ -55,12 +55,6 @@ static unsigned int bad_file_poll(struct file *filp, poll_table *wait)return POLLERR ; } -static int bad_file_ioctl (struct inode *inode,struct file *filp, -unsigned int cmd,unsigned long arg) -{ -return -EIO ; -} -static long bad_file_unlocked_ioctl (struct file *file,unsigned cmd,unsigned long arg) {
@@ -159,7 +153,6 @@ static const struct file_operations bad_file_ops = .aio_write = bad_file_aio_write, .readdir = bad_file_readdir, .poll = bad_file_poll, - .ioctl = bad_file_ioctl, .unlocked_ioctl = bad_file_unlocked_ioctl, .compat_ioctl = bad_file_compat_ioctl, .mmap = bad_file_mmap,
fs/compat_ioctl.c +1 -2
@@ -1699,8 +1699,7 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, goto out_fput; } -if (!filp->f_op || - (!filp->f_op->ioctl && !filp->f_op->unlocked_ioctl)) +if (!filp->f_op || !filp->f_op->unlocked_ioctl) goto do_ioctl;break ; }
fs/ioctl.c +4 -14
@@ -29,7 +29,6 @@* @arg: command-specific argument for ioctl * * Invokes filesystem specific ->unlocked_ioctl, if one exists; otherwise -* invokes filesystem specific ->ioctl method. If neither method exists, * returns -ENOTTY. * * Returns 0 on success, -errno on error.
@@ -39,21 +38,12 @@ static long vfs_ioctl(struct file *filp, unsigned int cmd, {int error = -ENOTTY ; -if (!filp->f_op) +if (!filp->f_op || !filp->f_op->unlocked_ioctl) goto out; -if (filp->f_op->unlocked_ioctl) { - error = filp->f_op->unlocked_ioctl (filp, cmd, arg); -if (error == -ENOIOCTLCMD ) - error = -EINVAL ; - goto out; - }else if (filp->f_op->ioctl) { -lock_kernel (); - error = filp->f_op->ioctl (filp->f_path.dentry->d_inode, - filp, cmd, arg); -unlock_kernel (); - } - + error = filp->f_op->unlocked_ioctl (filp, cmd, arg); +if (error == -ENOIOCTLCMD ) + error = -EINVAL ; out:return error; }
fs/proc/inode.c +4 -13
@@ -214,8 +214,7 @@ static long proc_reg_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne {struct proc_dir_entry *pde =PDE (file->f_path.dentry->d_inode);long rv = -ENOTTY ; -long (*unlocked_ioctl)(struct file *,unsigned int ,unsigned long ); -int (*ioctl)(struct inode *,struct file *,unsigned int ,unsigned long ); +long (*ioctl)(struct file *,unsigned int ,unsigned long );spin_lock (&pde->pde_unload_lock);if (!pde->proc_fops) {
@@ -223,19 +222,11 @@ static long proc_reg_unlocked_ioctl(struct file *file, unsigned int cmd, unsignereturn rv; } pde->pde_users++; - unlocked_ioctl = pde->proc_fops->unlocked_ioctl; - ioctl = pde->proc_fops->ioctl; + ioctl = pde->proc_fops->unlocked_ioctl;spin_unlock (&pde->pde_unload_lock); -if (unlocked_ioctl) { - rv =unlocked_ioctl (file, cmd, arg); -if (rv == -ENOIOCTLCMD ) - rv = -EINVAL ; - }else if (ioctl) { -WARN_ONCE (1 ,"Procfs ioctl handlers must use unlocked_ioctl, " -"%pf will be called without the Bkl held\n" , ioctl); - rv =ioctl (file->f_path.dentry->d_inode, file, cmd, arg); - } +if (ioctl) + rv =ioctl (file, cmd, arg);pde_users_dec (pde);return rv;
include/linux/fs.h +2 -3
@@ -1483,8 +1483,8 @@ struct block_device_operations;/* * NOTE: -* read, write, poll, fsync, readv, writev, unlocked_ioctl and compat_ioctl -* can be called without the big kernel lock held in all filesystems. +* all file operations except setlease can be called without +* the big kernel lock held in all filesystems. */ struct file_operations {struct module *owner;
@@ -1495,7 +1495,6 @@ struct file_operations {ssize_t (*aio_write) (struct kiocb *,const struct iovec *,unsigned long ,loff_t );int (*readdir) (struct file *,void *,filldir_t );unsigned int (*poll) (struct file *,struct poll_table_struct *); -int (*ioctl) (struct inode *,struct file *,unsigned int ,unsigned long );long (*unlocked_ioctl) (struct file *,unsigned int ,unsigned long );long (*compat_ioctl) (struct file *,unsigned int ,unsigned long );int (*mmap) (struct file *,struct vm_area_struct *);
Signature · 1 line
1.6.2.3