1 aufs2 base patch for linux-2.6.27
3 diff --git a/fs/namei.c b/fs/namei.c
4 index 4ea63ed..2759ad4 100644
7 @@ -1241,7 +1241,7 @@ out:
8 * needs parent already locked. Doesn't follow mounts.
11 -static struct dentry *lookup_hash(struct nameidata *nd)
12 +struct dentry *lookup_hash(struct nameidata *nd)
16 @@ -1251,7 +1251,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
17 return __lookup_hash(&nd->last, nd->path.dentry, nd);
20 -static int __lookup_one_len(const char *name, struct qstr *this,
21 +int __lookup_one_len(const char *name, struct qstr *this,
22 struct dentry *base, int len)
25 diff --git a/fs/splice.c b/fs/splice.c
26 index a1e701c..409245a 100644
29 @@ -887,8 +887,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
31 * Attempt to initiate a splice from pipe to file.
33 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
34 - loff_t *ppos, size_t len, unsigned int flags)
35 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
36 + loff_t *ppos, size_t len, unsigned int flags)
40 @@ -911,9 +911,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
42 * Attempt to initiate a splice from a file to a pipe.
44 -static long do_splice_to(struct file *in, loff_t *ppos,
45 - struct pipe_inode_info *pipe, size_t len,
47 +long do_splice_to(struct file *in, loff_t *ppos,
48 + struct pipe_inode_info *pipe, size_t len,
53 diff --git a/include/linux/namei.h b/include/linux/namei.h
54 index 68f8c32..5522432 100644
55 --- a/include/linux/namei.h
56 +++ b/include/linux/namei.h
57 @@ -71,6 +71,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
58 extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
59 extern void release_open_intent(struct nameidata *);
61 +extern struct dentry *lookup_hash(struct nameidata *nd);
62 +extern int __lookup_one_len(const char *name, struct qstr *this,
63 + struct dentry *base, int len);
64 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
65 extern struct dentry *lookup_one_noperm(const char *, struct dentry *);
67 diff --git a/include/linux/splice.h b/include/linux/splice.h
68 index 528dcb9..5123bc6 100644
69 --- a/include/linux/splice.h
70 +++ b/include/linux/splice.h
71 @@ -71,4 +71,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
72 extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
73 splice_direct_actor *);
75 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
76 + loff_t *ppos, size_t len, unsigned int flags);
77 +extern long do_splice_to(struct file *in, loff_t *ppos,
78 + struct pipe_inode_info *pipe, size_t len,
79 + unsigned int flags);