wok view linux/stuff/aufs2-base.patch @ rev 5575
linux-netfilter: don't pack ipv6 module
| author | Akim Bey <gokhlayeh@mailoo.org> |
|---|---|
| date | Sat May 15 14:41:17 2010 +0000 (2010-05-15) |
| parents | |
| children |
line source
1 aufs2 base patch for linux-2.6.33
3 diff --git a/fs/namei.c b/fs/namei.c
4 index a4855af..1d12d37 100644
5 --- a/fs/namei.c
6 +++ b/fs/namei.c
7 @@ -1207,7 +1207,7 @@ out:
8 * needs parent already locked. Doesn't follow mounts.
9 * SMP-safe.
10 */
11 -static struct dentry *lookup_hash(struct nameidata *nd)
12 +struct dentry *lookup_hash(struct nameidata *nd)
13 {
14 int err;
16 @@ -1217,7 +1217,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
17 return __lookup_hash(&nd->last, nd->path.dentry, nd);
18 }
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)
23 {
24 unsigned long hash;
25 diff --git a/fs/splice.c b/fs/splice.c
26 index 3920866..b13a9a2 100644
27 --- a/fs/splice.c
28 +++ b/fs/splice.c
29 @@ -1053,8 +1053,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
30 /*
31 * Attempt to initiate a splice from pipe to file.
32 */
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)
37 {
38 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
39 loff_t *, size_t, unsigned int);
40 @@ -1081,9 +1081,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
41 /*
42 * Attempt to initiate a splice from a file to a pipe.
43 */
44 -static long do_splice_to(struct file *in, loff_t *ppos,
45 - struct pipe_inode_info *pipe, size_t len,
46 - unsigned int flags)
47 +long do_splice_to(struct file *in, loff_t *ppos,
48 + struct pipe_inode_info *pipe, size_t len,
49 + unsigned int flags)
50 {
51 ssize_t (*splice_read)(struct file *, loff_t *,
52 struct pipe_inode_info *, size_t, unsigned int);
53 diff --git a/include/linux/namei.h b/include/linux/namei.h
54 index 05b441d..91bc74e 100644
55 --- a/include/linux/namei.h
56 +++ b/include/linux/namei.h
57 @@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
58 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
59 int (*open)(struct inode *, struct file *));
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);
66 extern int follow_down(struct path *);
67 diff --git a/include/linux/splice.h b/include/linux/splice.h
68 index 18e7c7c..8393b5c 100644
69 --- a/include/linux/splice.h
70 +++ b/include/linux/splice.h
71 @@ -82,4 +82,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);
80 +
81 #endif