diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 21:54:03 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 21:54:03 +0100 |
| commit | 19ccb28e296d5afa299db1003d37e5d37994d46e (patch) | |
| tree | 124859635b8f0c6c429c0b19ca3a092ad42da703 /fs/internal.h | |
| parent | Linux 4.4 (diff) | |
| parent | compat_ioctl: don't call do_ioctl under set_fs(KERNEL_DS) (diff) | |
| download | linux-19ccb28e296d5afa299db1003d37e5d37994d46e.tar.xz linux-19ccb28e296d5afa299db1003d37e5d37994d46e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs compat_ioctl fixes from Al Viro:
"This is basically Jann's patches from last week. I have _not_
included the stuff like switching i2c to ->compat_ioctl() into this
one - those need more testing.
Ideally I would like fs/compat_ioctl.c shrunk a lot, but that's a
separate story"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
compat_ioctl: don't call do_ioctl under set_fs(KERNEL_DS)
compat_ioctl: don't pass fd around when not needed
compat_ioctl: don't look up the fd twice
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/internal.h b/fs/internal.h index 71859c4d0b41..e38c08ca437d 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -151,3 +151,10 @@ extern void mnt_pin_kill(struct mount *m); * fs/nsfs.c */ extern struct dentry_operations ns_dentry_operations; + +/* + * fs/ioctl.c + */ +extern int do_vfs_ioctl(struct file *file, unsigned int fd, unsigned int cmd, + unsigned long arg); +extern long vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); |