diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-05-16 11:52:59 +0100 |
|---|---|---|
| committer | Linaro CI <john.rigby@linaro.org> | 2011-12-15 23:33:39 +0000 |
| commit | fb6a3c6347b583b7004b357f2570e0b9f978de2d (patch) | |
| tree | 13c70ea64944120ba1893aad1b62769aba720348 /fs | |
| parent | 5305f5c6e5da135b6216e43a35e877a3e8518f52 (diff) | |
UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-39
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 2 | ||||
| -rw-r--r-- | fs/splice.c | 10 |
2 files changed, 6 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); |