| rev |
line source |
|
pascal@0
|
1 aufs2.1 base patch for linux-2.6.
|
|
pascal@0
|
2
|
|
pascal@0
|
3 diff --git a/fs/namei.c b/fs/namei.c
|
|
pascal@0
|
4 index 5c867dd..95978ec 100644
|
|
pascal@0
|
5 --- a/fs/namei.c
|
|
pascal@0
|
6 +++ b/fs/namei.c
|
|
pascal@0
|
7 @@ -1692,7 +1692,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
|
|
pascal@0
|
8 * needs parent already locked. Doesn't follow mounts.
|
|
pascal@0
|
9 * SMP-safe.
|
|
pascal@0
|
10 */
|
|
pascal@0
|
11 -static struct dentry *lookup_hash(struct nameidata *nd)
|
|
pascal@0
|
12 +struct dentry *lookup_hash(struct nameidata *nd)
|
|
pascal@0
|
13 {
|
|
pascal@0
|
14 return __lookup_hash(&nd->last, nd->path.dentry, nd);
|
|
pascal@0
|
15 }
|
|
pascal@0
|
16 diff --git a/fs/splice.c b/fs/splice.c
|
|
pascal@0
|
17 index aa866d3..19afec6 100644
|
|
pascal@0
|
18 --- a/fs/splice.c
|
|
pascal@0
|
19 +++ b/fs/splice.c
|
|
pascal@0
|
20 @@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
|
|
pascal@0
|
21 /*
|
|
pascal@0
|
22 * Attempt to initiate a splice from pipe to file.
|
|
pascal@0
|
23 */
|
|
pascal@0
|
24 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
pascal@0
|
25 - loff_t *ppos, size_t len, unsigned int flags)
|
|
pascal@0
|
26 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
pascal@0
|
27 + loff_t *ppos, size_t len, unsigned int flags)
|
|
pascal@0
|
28 {
|
|
pascal@0
|
29 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
|
|
pascal@0
|
30 loff_t *, size_t, unsigned int);
|
|
pascal@0
|
31 @@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
pascal@0
|
32 /*
|
|
pascal@0
|
33 * Attempt to initiate a splice from a file to a pipe.
|
|
pascal@0
|
34 */
|
|
pascal@0
|
35 -static long do_splice_to(struct file *in, loff_t *ppos,
|
|
pascal@0
|
36 - struct pipe_inode_info *pipe, size_t len,
|
|
pascal@0
|
37 - unsigned int flags)
|
|
pascal@0
|
38 +long do_splice_to(struct file *in, loff_t *ppos,
|
|
pascal@0
|
39 + struct pipe_inode_info *pipe, size_t len,
|
|
pascal@0
|
40 + unsigned int flags)
|
|
pascal@0
|
41 {
|
|
pascal@0
|
42 ssize_t (*splice_read)(struct file *, loff_t *,
|
|
pascal@0
|
43 struct pipe_inode_info *, size_t, unsigned int);
|
|
pascal@0
|
44 diff --git a/include/linux/namei.h b/include/linux/namei.h
|
|
pascal@0
|
45 index eba45ea..21ed6c9 100644
|
|
pascal@0
|
46 --- a/include/linux/namei.h
|
|
pascal@0
|
47 +++ b/include/linux/namei.h
|
|
pascal@0
|
48 @@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
|
|
pascal@0
|
49 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
|
|
pascal@0
|
50 int (*open)(struct inode *, struct file *));
|
|
pascal@0
|
51
|
|
pascal@0
|
52 +extern struct dentry *lookup_hash(struct nameidata *nd);
|
|
pascal@0
|
53 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
|
|
pascal@0
|
54
|
|
pascal@0
|
55 extern int follow_down_one(struct path *);
|
|
pascal@0
|
56 diff --git a/include/linux/splice.h b/include/linux/splice.h
|
|
pascal@0
|
57 index 997c3b4..be9a153 100644
|
|
pascal@0
|
58 --- a/include/linux/splice.h
|
|
pascal@0
|
59 +++ b/include/linux/splice.h
|
|
pascal@0
|
60 @@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
|
|
pascal@0
|
61 extern void splice_shrink_spd(struct pipe_inode_info *,
|
|
pascal@0
|
62 struct splice_pipe_desc *);
|
|
pascal@0
|
63
|
|
pascal@0
|
64 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
|
|
pascal@0
|
65 + loff_t *ppos, size_t len, unsigned int flags);
|
|
pascal@0
|
66 +extern long do_splice_to(struct file *in, loff_t *ppos,
|
|
pascal@0
|
67 + struct pipe_inode_info *pipe, size_t len,
|
|
pascal@0
|
68 + unsigned int flags);
|
|
pascal@0
|
69 +
|
|
pascal@0
|
70 #endif
|