diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-11-22 15:04:58 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 15:50:26 -0600 |
| commit | e76f8f9393c3ed50607673a574318f2f7bbcb0cf (patch) | |
| tree | e11a089a4e3bc6397f05f5082ba23f9aa53efc31 /include | |
| parent | 1b06bc07f1fdb131a92d2373da7a0b78244e71ad (diff) | |
Revert "UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103"
This reverts commit f628a4f95358f73b2393bec6c5a8df31b903e2ea.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/namei.h | 3 | ||||
| -rw-r--r-- | include/linux/splice.h | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/namei.h b/include/linux/namei.h index 4eb5fcb0e3e4..f276d4fa01fc 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -79,9 +79,6 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, int (*open)(struct inode *, struct file *)); -extern struct dentry *lookup_hash(struct nameidata *nd); -extern int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len); extern struct dentry *lookup_one_len(const char *, struct dentry *, int); extern int follow_down_one(struct path *); diff --git a/include/linux/splice.h b/include/linux/splice.h index be9a153ea6e6..997c3b4c212b 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -89,10 +89,4 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); extern void splice_shrink_spd(struct pipe_inode_info *, struct splice_pipe_desc *); -extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags); -extern long do_splice_to(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, size_t len, - unsigned int flags); - #endif |