]>
Commit | Line | Data |
---|---|---|
a764c21a JR |
1 | diff --git a/fs/splice.c b/fs/splice.c |
2 | index efdbfec..e01a51e 100644 | |
3 | --- a/fs/splice.c | |
4 | +++ b/fs/splice.c | |
5 | @@ -1104,8 +1104,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); | |
6 | /* | |
7 | * Attempt to initiate a splice from pipe to file. | |
8 | */ | |
9 | -long do_splice_from(struct pipe_inode_info *pipe, struct file *out, | |
10 | - loff_t *ppos, size_t len, unsigned int flags) | |
11 | +static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, | |
12 | + loff_t *ppos, size_t len, unsigned int flags) | |
13 | { | |
14 | ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, | |
15 | loff_t *, size_t, unsigned int); | |
16 | @@ -1128,14 +1128,13 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, | |
17 | ||
18 | return splice_write(pipe, out, ppos, len, flags); | |
19 | } | |
325866d5 | 20 | -EXPORT_SYMBOL(do_splice_from); |
a764c21a JR |
21 | |
22 | /* | |
23 | * Attempt to initiate a splice from a file to a pipe. | |
24 | */ | |
25 | -long do_splice_to(struct file *in, loff_t *ppos, | |
26 | - struct pipe_inode_info *pipe, size_t len, | |
27 | - unsigned int flags) | |
28 | +static long do_splice_to(struct file *in, loff_t *ppos, | |
29 | + struct pipe_inode_info *pipe, size_t len, | |
30 | + unsigned int flags) | |
31 | { | |
32 | ssize_t (*splice_read)(struct file *, loff_t *, | |
33 | struct pipe_inode_info *, size_t, unsigned int); | |
34 | @@ -1154,7 +1155,6 @@ long do_splice_to(struct file *in, loff_t *ppos, | |
35 | ||
36 | return splice_read(in, ppos, pipe, len, flags); | |
37 | } | |
325866d5 | 38 | -EXPORT_SYMBOL(do_splice_to); |
a764c21a JR |
39 | |
40 | /** | |
41 | * splice_direct_to_actor - splices data directly between two non-pipes | |
15a51848 JR |
42 | diff --git a/include/linux/namei.h b/include/linux/namei.h |
43 | index eba45ea..21ed6c9 100644 | |
44 | --- a/include/linux/namei.h | |
45 | +++ b/include/linux/namei.h | |
46 | @@ -82,11 +82,11 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, | |
47 | extern int kern_path_parent(const char *, struct nameidata *); | |
48 | extern int vfs_path_lookup(struct dentry *, struct vfsmount *, | |
50375105 | 49 | const char *, unsigned int, struct path *); |
15a51848 JR |
50 | +extern struct dentry *lookup_hash(struct nameidata *nd); |
51 | ||
52 | extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, | |
53 | int (*open)(struct inode *, struct file *)); | |
54 | ||
55 | -extern struct dentry *lookup_hash(struct nameidata *nd); | |
56 | extern struct dentry *lookup_one_len(const char *, struct dentry *, int); | |
57 | ||
58 | extern int follow_down_one(struct path *); | |
a764c21a JR |
59 | diff --git a/include/linux/splice.h b/include/linux/splice.h |
60 | index 997c3b4..be9a153 100644 | |
61 | --- a/include/linux/splice.h | |
62 | +++ b/include/linux/splice.h | |
50375105 AM |
63 | @@ -91,10 +91,4 @@ extern void splice_shrink_spd(struct pip |
64 | extern void spd_release_page(struct splice_pipe_desc *, unsigned int); | |
a764c21a | 65 | |
50375105 AM |
66 | extern const struct pipe_buf_operations page_cache_pipe_buf_ops; |
67 | - | |
a764c21a JR |
68 | -extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
69 | - loff_t *ppos, size_t len, unsigned int flags); | |
70 | -extern long do_splice_to(struct file *in, loff_t *ppos, | |
71 | - struct pipe_inode_info *pipe, size_t len, | |
72 | - unsigned int flags); | |
a764c21a JR |
73 | #endif |
74 | aufs2 standalone patch for linux-2.6.35 | |
75 | ||
76 | diff --git a/security/security.c b/security/security.c | |
77 | index 351942a..6ba84a8 100644 | |
78 | --- a/security/security.c | |
79 | +++ b/security/security.c | |
80 | @@ -529,7 +539,6 @@ int security_inode_permission(struct inode *inode, int mask) | |
81 | return 0; | |
82 | return security_ops->inode_permission(inode, mask); | |
83 | } | |
325866d5 | 84 | -EXPORT_SYMBOL(security_inode_permission); |
a764c21a JR |
85 | |
86 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | |
87 | { | |
88 | diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c | |
89 | --- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100 | |
90 | +++ linux/fs/aufs/vfsub.c 2010-08-21 21:00:02.986708041 +0200 | |
2cbb1c4b | 91 | @@ -530,7 +530,7 @@ long vfsub_splice_to |
a764c21a JR |
92 | long err; |
93 | ||
2cbb1c4b | 94 | lockdep_off(); |
a764c21a JR |
95 | - err = do_splice_to(in, ppos, pipe, len, flags); |
96 | + err = vfs_splice_to(in, ppos, pipe, len, flags); | |
2cbb1c4b | 97 | lockdep_on(); |
a764c21a JR |
98 | file_accessed(in); |
99 | if (err >= 0) | |
2cbb1c4b | 100 | @@ -542,7 +542,7 @@ long vfsub_splice_from |
a764c21a JR |
101 | long err; |
102 | ||
2cbb1c4b | 103 | lockdep_off(); |
a764c21a JR |
104 | - err = do_splice_from(pipe, out, ppos, len, flags); |
105 | + err = vfs_splice_from(pipe, out, ppos, len, flags); | |
2cbb1c4b | 106 | lockdep_on(); |
a764c21a JR |
107 | if (err >= 0) |
108 | vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/ |