diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-01-05 14:25:47 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-23 23:16:07 -0600 |
| commit | ca3cdc3d44345ae4e962e037373dbcacfdabae4f (patch) | |
| tree | 011a414b65fca5ef4235c3924607eaed574404e4 /include | |
| parent | d38bef605aca75acffdd368b03627d70502832af (diff) | |
UBUNTU: ubuntu: AUFS -- aufs3-base.patch
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'include')
| -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 ffc02135c48..ef35a3198c9 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -85,6 +85,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 26e5b613ded..3ffef2fe0fd 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, extern void spd_release_page(struct splice_pipe_desc *, unsigned int); extern const struct pipe_buf_operations page_cache_pipe_buf_ops; + +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 |