diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-11-07 02:13:30 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-12-13 16:44:01 -0700 |
| commit | 4e8b99a1d216dcf95104bdab5c39c5e4eddaa42b (patch) | |
| tree | 4acf962eff9ced7dedda17ed7ff049dd2d57ecc7 /fs | |
| parent | 02428276cf9f55e9287db85243dd68f0d84f5ef7 (diff) | |
UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103
Pull aufs up to the experimental aufs2.1-36-UNRELEASED-20101103
from the URL below:
http://livenet.selfip.com/ftp/debian/aufs2.1-36/
Based on patches from J.R.Okajima and Jordi Pujol and others, see the
mail thread below from the aufs-users list for further information:
http://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg02921.html
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 4 | ||||
| -rw-r--r-- | fs/splice.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c index 5362af9b7372..5fe904dc3963 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1161,12 +1161,12 @@ out: * 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); } -static int __lookup_one_len(const char *name, struct qstr *this, +int __lookup_one_len(const char *name, struct qstr *this, struct dentry *base, int len) { unsigned long hash; diff --git a/fs/splice.c b/fs/splice.c index ce2f02579e35..ff0ae69d45cf 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1092,8 +1092,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); @@ -1120,9 +1120,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); |