diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-05-16 11:52:59 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:50:04 -0600 |
| commit | d0c53d0b5b30f39aefd30151ca7e2a6c956449ae (patch) | |
| tree | 061f274da7cc00ab7a76927c462eeb8cc1550c25 /include/linux | |
| parent | 4928bb606c64a760422777587b96fa745ede57c2 (diff) | |
UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-39
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/namei.h | 1 | ||||
| -rw-r--r-- | include/linux/splice.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/namei.h b/include/linux/namei.h index eba45ea1029..21ed6c94493 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -82,6 +82,7 @@ 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 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 997c3b4c212..be9a153ea6e 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -89,4 +89,10 @@ 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 |