]>
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 | |
42 | diff --git a/include/linux/splice.h b/include/linux/splice.h | |
43 | index 997c3b4..be9a153 100644 | |
44 | --- a/include/linux/splice.h | |
45 | +++ b/include/linux/splice.h | |
50375105 AM |
46 | @@ -91,10 +91,4 @@ extern void splice_shrink_spd(struct pip |
47 | extern void spd_release_page(struct splice_pipe_desc *, unsigned int); | |
a764c21a | 48 | |
50375105 AM |
49 | extern const struct pipe_buf_operations page_cache_pipe_buf_ops; |
50 | - | |
a764c21a JR |
51 | -extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
52 | - loff_t *ppos, size_t len, unsigned int flags); | |
53 | -extern long do_splice_to(struct file *in, loff_t *ppos, | |
54 | - struct pipe_inode_info *pipe, size_t len, | |
55 | - unsigned int flags); | |
a764c21a JR |
56 | #endif |
57 | aufs2 standalone patch for linux-2.6.35 | |
58 | ||
59 | diff --git a/security/security.c b/security/security.c | |
60 | index 351942a..6ba84a8 100644 | |
61 | --- a/security/security.c | |
62 | +++ b/security/security.c | |
63 | @@ -529,7 +539,6 @@ int security_inode_permission(struct inode *inode, int mask) | |
64 | return 0; | |
65 | return security_ops->inode_permission(inode, mask); | |
66 | } | |
325866d5 | 67 | -EXPORT_SYMBOL(security_inode_permission); |
a764c21a JR |
68 | |
69 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | |
70 | { | |
71 | diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c | |
72 | --- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100 | |
73 | +++ linux/fs/aufs/vfsub.c 2010-08-21 21:00:02.986708041 +0200 | |
2cbb1c4b | 74 | @@ -530,7 +530,7 @@ long vfsub_splice_to |
a764c21a JR |
75 | long err; |
76 | ||
2cbb1c4b | 77 | lockdep_off(); |
a764c21a JR |
78 | - err = do_splice_to(in, ppos, pipe, len, flags); |
79 | + err = vfs_splice_to(in, ppos, pipe, len, flags); | |
2cbb1c4b | 80 | lockdep_on(); |
a764c21a JR |
81 | file_accessed(in); |
82 | if (err >= 0) | |
2cbb1c4b | 83 | @@ -542,7 +542,7 @@ long vfsub_splice_from |
a764c21a JR |
84 | long err; |
85 | ||
2cbb1c4b | 86 | lockdep_off(); |
a764c21a JR |
87 | - err = do_splice_from(pipe, out, ppos, len, flags); |
88 | + err = vfs_splice_from(pipe, out, ppos, len, flags); | |
2cbb1c4b | 89 | lockdep_on(); |
a764c21a JR |
90 | if (err >= 0) |
91 | vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/ |