diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 17:52:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 17:52:35 -0700 |
| commit | 10041d2d14688e207d0d829095147aa82c1f211b (patch) | |
| tree | 57ef361d05e6bbffe3ec490ca9110878a6e969e2 /include/linux | |
| parent | 4914c7f881845367b9198631a014ab466329b9e5 (diff) | |
| parent | b19dd42faf413b4705d4adb38521e82d73fa4249 (diff) | |
| download | linux-10041d2d14688e207d0d829095147aa82c1f211b.tar.gz linux-10041d2d14688e207d0d829095147aa82c1f211b.tar.bz2 linux-10041d2d14688e207d0d829095147aa82c1f211b.zip | |
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* '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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 5f0ca2fbb2a0..9a96b4d83fc1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -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 *); |