diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-01-05 14:25:47 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-21 02:53:17 -0600 |
| commit | e6a1f1031f7d472e372dc3395e065c9b29f14951 (patch) | |
| tree | 425542a843c4c7d7494c79b534ab1a415690f0cc /fs | |
| parent | 47ca6b3074304afd96156291e5ae579e2272d12b (diff) | |
UBUNTU: ubuntu: AUFS -- aufs3-base.patch
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 c42791914f8..7ff959bfdc4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, * 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 f8476841eb0..f8712334176 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1084,8 +1084,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); @@ -1112,9 +1112,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); |