summaryrefslogtreecommitdiffstats
path: root/fs/internal.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-09 03:20:11 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2016-01-09 03:20:11 +0100
commit6108209c4ae964836f6bac5210f1c64153800b62 (patch)
tree83651902b46af6bbf8d2ea4841b397bac306095b /fs/internal.h
parentfs: use block_device name vsprintf helper (diff)
parentcompat_ioctl: don't call do_ioctl under set_fs(KERNEL_DS) (diff)
downloadlinux-6108209c4ae964836f6bac5210f1c64153800b62.tar.xz
linux-6108209c4ae964836f6bac5210f1c64153800b62.zip
Merge branch 'for-linus' into work.misc
Diffstat (limited to 'fs/internal.h')
-rw-r--r--fs/internal.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/internal.h b/fs/internal.h
index aa81316aaf47..b71deeecea17 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);