diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-05-16 11:52:59 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:49:02 -0600 |
| commit | ef5ab9b8297059c396a8e4fb45b1ad8cfe0e43a0 (patch) | |
| tree | c2463cf48901738dc8321625dd2f7c26a42efac7 | |
| parent | 1d3e36dda2399320d1955c0fdd6f953402c8805d (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 | 6 |
4 files changed, 13 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c index b456c7a2e6b..2724460f532 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1697,7 +1697,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 aa866d30969..19afec64743 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 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 |