Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

* 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  bkl: Remove locked .ioctl file operation
  v4l: Remove reference to bkl ioctl in compat ioctl handling
  logfs: kill BKL

diff --combined include/linux/fs.h
index 5f0ca2fbb2a0e07fafeff21fa5f936ae59d15f54,3c786fdaeab628b8bdbe338820f6ece3d90cdc17..9a96b4d83fc126a92adb9c87f7f1e5ae62bc0056
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -1483,8 -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 +1495,6 @@@
        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 *);
@@@ -2320,10 -2319,10 +2319,10 @@@ void inode_set_bytes(struct inode *inod
  
  extern int vfs_readdir(struct file *, filldir_t, void *);
  
 -extern int vfs_stat(char __user *, struct kstat *);
 -extern int vfs_lstat(char __user *, struct kstat *);
 +extern int vfs_stat(const char __user *, struct kstat *);
 +extern int vfs_lstat(const char __user *, struct kstat *);
  extern int vfs_fstat(unsigned int, struct kstat *);
 -extern int vfs_fstatat(int , char __user *, struct kstat *, int);
 +extern int vfs_fstatat(int , const char __user *, struct kstat *, int);
  
  extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
                    unsigned long arg);