path: root/include
diff options
authorLinus Torvalds <>2016-01-11 12:54:03 -0800
committerLinus Torvalds <>2016-01-11 12:54:03 -0800
commit19ccb28e296d5afa299db1003d37e5d37994d46e (patch)
tree124859635b8f0c6c429c0b19ca3a092ad42da703 /include
parentafd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff)
parenta7f61e89af73e9bf760826b20dba4e637221fcb9 (diff)
Merge branch 'for-linus' of git://
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:// 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 'include')
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 3aa514254161..51f9f8d93d4d 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2764,8 +2764,6 @@ extern int vfs_lstat(const char __user *, struct kstat *);
extern int vfs_fstat(unsigned int, struct kstat *);
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);
extern int __generic_block_fiemap(struct inode *inode,
struct fiemap_extent_info *fieinfo,
loff_t start, loff_t len,