diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-23 22:52:55 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-23 22:52:55 -0400 |
| commit | 1be47b387a717a1d3edf29c80b6e7f3a72ab236e (patch) | |
| tree | 5bd5f4b46b5266f5f583f601b8880211ee224c95 /fs/internal.h | |
| parent | 51486b900ee92856b977eacfc5bfbe6565028070 (diff) | |
| parent | 69c433ed2ecd2d3264efd7afec4439524b319121 (diff) | |
Merge branch 'overlayfs.v25' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/internal.h b/fs/internal.h index 9477f8f6aef..757ba2abf21 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -47,7 +47,6 @@ extern void __init chrdev_init(void); /* * namei.c */ -extern int __inode_permission(struct inode *, int); extern int user_path_mountpoint_at(int, const char __user *, unsigned int, struct path *); extern int vfs_path_lookup(struct dentry *, struct vfsmount *, const char *, unsigned int, struct path *); @@ -139,12 +138,6 @@ extern long prune_dcache_sb(struct super_block *sb, unsigned long nr_to_scan, extern int rw_verify_area(int, struct file *, const loff_t *, size_t); /* - * splice.c - */ -extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, - loff_t *opos, size_t len, unsigned int flags); - -/* * pipe.c */ extern const struct file_operations pipefifo_fops; |