diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-05-16 11:52:59 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:24:15 -0700 |
| commit | 1f461ca097411e721a5f6c96abe4905f7dba884d (patch) | |
| tree | ec4263114517de3b70330286f6dd5f547eb6c185 | |
| parent | f9d3443bf0a2ec42766531e0070dcf6952010b8e (diff) | |
UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-39
Signed-off-by: Andy Whitcroft <apw@canonical.com>
| -rw-r--r-- | fs/namei.c | 2 | ||||
| -rw-r--r-- | fs/splice.c | 10 | ||||
| -rw-r--r-- | include/linux/namei.h | 1 | ||||
| -rw-r--r-- | include/linux/splice.h | 7 |
4 files changed, 14 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c index 3d150720c37..c734be320ad 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name, * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ -static struct dentry *lookup_hash(struct nameidata *nd) +struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->path.dentry, nd); } diff --git a/fs/splice.c b/fs/splice.c index fa2defa8afc..e3569b0dce1 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags) +long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags) { ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); @@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, /* * Attempt to initiate a splice from a file to a pipe. */ -static long do_splice_to(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, size_t len, - unsigned int flags) +long do_splice_to(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) { ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); 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..e4795441735 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -91,4 +91,11 @@ 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 |