diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-11-07 02:13:30 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 15:48:49 -0600 |
| commit | d082cd71c8f5608071a6cb3783ff530b3adbb869 (patch) | |
| tree | 6eb3d40602e31ad929d7405cc00932695a09827e | |
| parent | ff469593fdbe99ca66719115b6e89800ea380988 (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>
| -rw-r--r-- | fs/namei.c | 4 | ||||
| -rw-r--r-- | fs/splice.c | 10 | ||||
| -rw-r--r-- | include/linux/namei.h | 3 | ||||
| -rw-r--r-- | include/linux/splice.h | 6 |
4 files changed, 16 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c index a4689eb2df2..05135631d10 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1842,12 +1842,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 50a5d978da1..886e942cf0f 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1081,8 +1081,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); @@ -1109,9 +1109,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 f276d4fa01f..4eb5fcb0e3e 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -79,6 +79,9 @@ 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 int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len); 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 |