diff options
| author | Amit Kucheria <amit.kucheria@canonical.com> | 2010-03-23 14:20:36 +0200 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2010-06-10 11:26:19 +0200 |
| commit | ebbd9163a5d2b6c366e2329a421e33d5e7be457d (patch) | |
| tree | 3524675d13cae124c822279f760430e809406958 /fs | |
| parent | 640c224b0aaeb8cb47cf2c8eadf9a10604106e66 (diff) | |
UBUNTU: SAUCE: Re-export the symbols for aufs
lookup_hash, do_splice_to and do_splice_from used to be exported to modules.
They've recently been made static upstream. Hence aufs will not compile on
2.6.33 without this patch.
Add this patch while we evaluate if unionfs is usable.
OriginalLocation:
http://ftp.riken.go.jp/pub/pub/Linux/gentoo/sys-fs/aufs2/files/aufs2-base-33.patch
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@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 b86b96fe1dc3..c43d6b8ea955 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1177,7 +1177,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; @@ -1187,7 +1187,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 9313b6124a2e..b9e871fa5efa 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1054,8 +1054,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); @@ -1082,9 +1082,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); |