Merge branch 'for-linus' into work.misc

This commit is contained in:
Al Viro 2016-01-08 21:20:11 -05:00
commit 6108209c4a
77 changed files with 855 additions and 568 deletions

View file

@ -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);