diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-08 21:20:11 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-08 21:20:11 -0500 |
| commit | 6108209c4ae964836f6bac5210f1c64153800b62 (patch) | |
| tree | 83651902b46af6bbf8d2ea4841b397bac306095b /fs/internal.h | |
| parent | a1c6f05733c27ba7067c06c095f49e8732a5ae17 (diff) | |
| parent | a7f61e89af73e9bf760826b20dba4e637221fcb9 (diff) | |
| download | linux-6108209c4ae964836f6bac5210f1c64153800b62.tar.gz linux-6108209c4ae964836f6bac5210f1c64153800b62.tar.bz2 linux-6108209c4ae964836f6bac5210f1c64153800b62.zip | |
Merge branch 'for-linus' into work.misc
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 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); |