summaryrefslogtreecommitdiff
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-09 05:20:11 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2016-01-09 05:20:11 +0300
commit6108209c4ae964836f6bac5210f1c64153800b62 (patch)
tree83651902b46af6bbf8d2ea4841b397bac306095b /include/linux/fs.h
parenta1c6f05733c27ba7067c06c095f49e8732a5ae17 (diff)
parenta7f61e89af73e9bf760826b20dba4e637221fcb9 (diff)
downloadlinux-6108209c4ae964836f6bac5210f1c64153800b62.tar.xz
Merge branch 'for-linus' into work.misc
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index fb0fa224d8e8..8793d43cfd5a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2766,8 +2766,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,