diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-06-01 14:10:55 +0100 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-09-02 13:43:26 -0700 |
| commit | 1f33433e9e49f9a4d1fe19b9d986b9bd00bef281 (patch) | |
| tree | 0ef827f31f0c827a9cd9be3497a2740d336b2005 /fs | |
| parent | 15f09588d575b5ddf09bd475709a1e3ed2a44208 (diff) | |
UBUNTU: ubuntu: AUFS -- aufs2 base patch for linux-2.6.34
BugLink: http://bugs.launchpad.net/bugs/587888
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@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 868d0cb9d47..6e92c816bf4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1178,7 +1178,7 @@ 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) { int err; @@ -1188,7 +1188,7 @@ static 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 efdbfece993..e01a51e54c0 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1104,8 +1104,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); @@ -1132,9 +1132,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); |