1 |
jlec 12/01/09 10:22:19 |
2 |
|
3 |
Modified: aufs3-standalone-0.patch |
4 |
Added: aufs3-base-2.patch aufs3-standalone-2.patch |
5 |
Log: |
6 |
Version Bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 sys-fs/aufs3/files/aufs3-standalone-0.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-0.patch?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-0.patch?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-0.patch?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: aufs3-standalone-0.patch |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-0.patch,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- aufs3-standalone-0.patch 31 Oct 2011 14:01:21 -0000 1.2 |
24 |
+++ aufs3-standalone-0.patch 9 Jan 2012 10:22:19 -0000 1.3 |
25 |
@@ -131,7 +131,7 @@ |
26 |
static long do_sys_truncate(const char __user *pathname, loff_t length) |
27 |
{ |
28 |
diff --git a/fs/splice.c b/fs/splice.c |
29 |
-index 19afec6..11f07f8 100644 |
30 |
+index 19afec6..11f07f86 100644 |
31 |
--- a/fs/splice.c |
32 |
+++ b/fs/splice.c |
33 |
@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
34 |
|
35 |
|
36 |
|
37 |
1.1 sys-fs/aufs3/files/aufs3-base-2.patch |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-base-2.patch?rev=1.1&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-base-2.patch?rev=1.1&content-type=text/plain |
41 |
|
42 |
Index: aufs3-base-2.patch |
43 |
=================================================================== |
44 |
aufs3.2 base patch |
45 |
|
46 |
diff --git a/fs/namei.c b/fs/namei.c |
47 |
index 5008f01..4cc94cf 100644 |
48 |
--- a/fs/namei.c |
49 |
+++ b/fs/namei.c |
50 |
@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name, |
51 |
* needs parent already locked. Doesn't follow mounts. |
52 |
* SMP-safe. |
53 |
*/ |
54 |
-static struct dentry *lookup_hash(struct nameidata *nd) |
55 |
+struct dentry *lookup_hash(struct nameidata *nd) |
56 |
{ |
57 |
return __lookup_hash(&nd->last, nd->path.dentry, nd); |
58 |
} |
59 |
diff --git a/fs/splice.c b/fs/splice.c |
60 |
index fa2defa..e3569b0 100644 |
61 |
--- a/fs/splice.c |
62 |
+++ b/fs/splice.c |
63 |
@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); |
64 |
/* |
65 |
* Attempt to initiate a splice from pipe to file. |
66 |
*/ |
67 |
-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
68 |
- loff_t *ppos, size_t len, unsigned int flags) |
69 |
+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
70 |
+ loff_t *ppos, size_t len, unsigned int flags) |
71 |
{ |
72 |
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, |
73 |
loff_t *, size_t, unsigned int); |
74 |
@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
75 |
/* |
76 |
* Attempt to initiate a splice from a file to a pipe. |
77 |
*/ |
78 |
-static long do_splice_to(struct file *in, loff_t *ppos, |
79 |
- struct pipe_inode_info *pipe, size_t len, |
80 |
- unsigned int flags) |
81 |
+long do_splice_to(struct file *in, loff_t *ppos, |
82 |
+ struct pipe_inode_info *pipe, size_t len, |
83 |
+ unsigned int flags) |
84 |
{ |
85 |
ssize_t (*splice_read)(struct file *, loff_t *, |
86 |
struct pipe_inode_info *, size_t, unsigned int); |
87 |
diff --git a/include/linux/namei.h b/include/linux/namei.h |
88 |
index ffc0213..ef35a31 100644 |
89 |
--- a/include/linux/namei.h |
90 |
+++ b/include/linux/namei.h |
91 |
@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, |
92 |
extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, |
93 |
int (*open)(struct inode *, struct file *)); |
94 |
|
95 |
+extern struct dentry *lookup_hash(struct nameidata *nd); |
96 |
extern struct dentry *lookup_one_len(const char *, struct dentry *, int); |
97 |
|
98 |
extern int follow_down_one(struct path *); |
99 |
diff --git a/include/linux/splice.h b/include/linux/splice.h |
100 |
index 26e5b61..3ffef2f 100644 |
101 |
--- a/include/linux/splice.h |
102 |
+++ b/include/linux/splice.h |
103 |
@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, |
104 |
extern void spd_release_page(struct splice_pipe_desc *, unsigned int); |
105 |
|
106 |
extern const struct pipe_buf_operations page_cache_pipe_buf_ops; |
107 |
+ |
108 |
+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
109 |
+ loff_t *ppos, size_t len, unsigned int flags); |
110 |
+extern long do_splice_to(struct file *in, loff_t *ppos, |
111 |
+ struct pipe_inode_info *pipe, size_t len, |
112 |
+ unsigned int flags); |
113 |
#endif |
114 |
|
115 |
|
116 |
|
117 |
1.1 sys-fs/aufs3/files/aufs3-standalone-2.patch |
118 |
|
119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-2.patch?rev=1.1&view=markup |
120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-2.patch?rev=1.1&content-type=text/plain |
121 |
|
122 |
Index: aufs3-standalone-2.patch |
123 |
=================================================================== |
124 |
aufs3.2 standalone patch |
125 |
|
126 |
diff --git a/fs/file_table.c b/fs/file_table.c |
127 |
index c322794..2aad244 100644 |
128 |
--- a/fs/file_table.c |
129 |
+++ b/fs/file_table.c |
130 |
@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) |
131 |
} |
132 |
} |
133 |
|
134 |
+EXPORT_SYMBOL(file_sb_list_del); |
135 |
+ |
136 |
#ifdef CONFIG_SMP |
137 |
|
138 |
/* |
139 |
diff --git a/fs/inode.c b/fs/inode.c |
140 |
index ee4e66b..728042b 100644 |
141 |
--- a/fs/inode.c |
142 |
+++ b/fs/inode.c |
143 |
@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; |
144 |
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); |
145 |
|
146 |
__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); |
147 |
+EXPORT_SYMBOL(inode_sb_list_lock); |
148 |
|
149 |
/* |
150 |
* Empty aops. Can be used for the cases where the user does not |
151 |
diff --git a/fs/namei.c b/fs/namei.c |
152 |
index 4cc94cf..af19e30 100644 |
153 |
--- a/fs/namei.c |
154 |
+++ b/fs/namei.c |
155 |
@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd) |
156 |
{ |
157 |
return __lookup_hash(&nd->last, nd->path.dentry, nd); |
158 |
} |
159 |
+EXPORT_SYMBOL(lookup_hash); |
160 |
|
161 |
/** |
162 |
* lookup_one_len - filesystem helper to lookup single pathname component |
163 |
diff --git a/fs/namespace.c b/fs/namespace.c |
164 |
index cfc6d44..173d15a 100644 |
165 |
--- a/fs/namespace.c |
166 |
+++ b/fs/namespace.c |
167 |
@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, |
168 |
} |
169 |
return 0; |
170 |
} |
171 |
+EXPORT_SYMBOL(iterate_mounts); |
172 |
|
173 |
static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) |
174 |
{ |
175 |
diff --git a/fs/notify/group.c b/fs/notify/group.c |
176 |
index 63fc294..6f4adca 100644 |
177 |
--- a/fs/notify/group.c |
178 |
+++ b/fs/notify/group.c |
179 |
@@ -22,6 +22,7 @@ |
180 |
#include <linux/srcu.h> |
181 |
#include <linux/rculist.h> |
182 |
#include <linux/wait.h> |
183 |
+#include <linux/module.h> |
184 |
|
185 |
#include <linux/fsnotify_backend.h> |
186 |
#include "fsnotify.h" |
187 |
@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) |
188 |
if (atomic_dec_and_test(&group->refcnt)) |
189 |
fsnotify_destroy_group(group); |
190 |
} |
191 |
+EXPORT_SYMBOL(fsnotify_put_group); |
192 |
|
193 |
/* |
194 |
* Create a new fsnotify_group and hold a reference for the group returned. |
195 |
@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) |
196 |
|
197 |
return group; |
198 |
} |
199 |
+EXPORT_SYMBOL(fsnotify_alloc_group); |
200 |
diff --git a/fs/notify/mark.c b/fs/notify/mark.c |
201 |
index e14587d..be6533b 100644 |
202 |
--- a/fs/notify/mark.c |
203 |
+++ b/fs/notify/mark.c |
204 |
@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) |
205 |
if (atomic_dec_and_test(&mark->refcnt)) |
206 |
mark->free_mark(mark); |
207 |
} |
208 |
+EXPORT_SYMBOL(fsnotify_put_mark); |
209 |
|
210 |
/* |
211 |
* Any time a mark is getting freed we end up here. |
212 |
@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) |
213 |
if (unlikely(atomic_dec_and_test(&group->num_marks))) |
214 |
fsnotify_final_destroy_group(group); |
215 |
} |
216 |
+EXPORT_SYMBOL(fsnotify_destroy_mark); |
217 |
|
218 |
void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) |
219 |
{ |
220 |
@@ -276,6 +278,7 @@ err: |
221 |
|
222 |
return ret; |
223 |
} |
224 |
+EXPORT_SYMBOL(fsnotify_add_mark); |
225 |
|
226 |
/* |
227 |
* clear any marks in a group in which mark->flags & flags is true |
228 |
@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, |
229 |
atomic_set(&mark->refcnt, 1); |
230 |
mark->free_mark = free_mark; |
231 |
} |
232 |
+EXPORT_SYMBOL(fsnotify_init_mark); |
233 |
|
234 |
static int fsnotify_mark_destroy(void *ignored) |
235 |
{ |
236 |
diff --git a/fs/open.c b/fs/open.c |
237 |
index 22c41b5..33b4033 100644 |
238 |
--- a/fs/open.c |
239 |
+++ b/fs/open.c |
240 |
@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, |
241 |
mutex_unlock(&dentry->d_inode->i_mutex); |
242 |
return ret; |
243 |
} |
244 |
+EXPORT_SYMBOL(do_truncate); |
245 |
|
246 |
static long do_sys_truncate(const char __user *pathname, loff_t length) |
247 |
{ |
248 |
diff --git a/fs/splice.c b/fs/splice.c |
249 |
index e3569b0..9dc07b7 100644 |
250 |
--- a/fs/splice.c |
251 |
+++ b/fs/splice.c |
252 |
@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
253 |
|
254 |
return splice_write(pipe, out, ppos, len, flags); |
255 |
} |
256 |
+EXPORT_SYMBOL(do_splice_from); |
257 |
|
258 |
/* |
259 |
* Attempt to initiate a splice from a file to a pipe. |
260 |
@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, |
261 |
|
262 |
return splice_read(in, ppos, pipe, len, flags); |
263 |
} |
264 |
+EXPORT_SYMBOL(do_splice_to); |
265 |
|
266 |
/** |
267 |
* splice_direct_to_actor - splices data directly between two non-pipes |
268 |
diff --git a/security/commoncap.c b/security/commoncap.c |
269 |
index ee4f848..611fd70 100644 |
270 |
--- a/security/commoncap.c |
271 |
+++ b/security/commoncap.c |
272 |
@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, |
273 |
} |
274 |
return ret; |
275 |
} |
276 |
+EXPORT_SYMBOL(cap_file_mmap); |
277 |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c |
278 |
index 4450fbe..bc94175 100644 |
279 |
--- a/security/device_cgroup.c |
280 |
+++ b/security/device_cgroup.c |
281 |
@@ -7,6 +7,7 @@ |
282 |
#include <linux/device_cgroup.h> |
283 |
#include <linux/cgroup.h> |
284 |
#include <linux/ctype.h> |
285 |
+#include <linux/export.h> |
286 |
#include <linux/list.h> |
287 |
#include <linux/uaccess.h> |
288 |
#include <linux/seq_file.h> |
289 |
@@ -500,6 +501,7 @@ found: |
290 |
|
291 |
return -EPERM; |
292 |
} |
293 |
+EXPORT_SYMBOL(__devcgroup_inode_permission); |
294 |
|
295 |
int devcgroup_inode_mknod(int mode, dev_t dev) |
296 |
{ |
297 |
diff --git a/security/security.c b/security/security.c |
298 |
index e2f684a..892000c 100644 |
299 |
--- a/security/security.c |
300 |
+++ b/security/security.c |
301 |
@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) |
302 |
return 0; |
303 |
return security_ops->path_rmdir(dir, dentry); |
304 |
} |
305 |
+EXPORT_SYMBOL(security_path_rmdir); |
306 |
|
307 |
int security_path_unlink(struct path *dir, struct dentry *dentry) |
308 |
{ |
309 |
@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, |
310 |
return 0; |
311 |
return security_ops->path_symlink(dir, dentry, old_name); |
312 |
} |
313 |
+EXPORT_SYMBOL(security_path_symlink); |
314 |
|
315 |
int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
316 |
struct dentry *new_dentry) |
317 |
@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
318 |
return 0; |
319 |
return security_ops->path_link(old_dentry, new_dir, new_dentry); |
320 |
} |
321 |
+EXPORT_SYMBOL(security_path_link); |
322 |
|
323 |
int security_path_rename(struct path *old_dir, struct dentry *old_dentry, |
324 |
struct path *new_dir, struct dentry *new_dentry) |
325 |
@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path) |
326 |
return 0; |
327 |
return security_ops->path_truncate(path); |
328 |
} |
329 |
+EXPORT_SYMBOL(security_path_truncate); |
330 |
|
331 |
int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, |
332 |
mode_t mode) |
333 |
@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, |
334 |
return 0; |
335 |
return security_ops->path_chmod(dentry, mnt, mode); |
336 |
} |
337 |
+EXPORT_SYMBOL(security_path_chmod); |
338 |
|
339 |
int security_path_chown(struct path *path, uid_t uid, gid_t gid) |
340 |
{ |
341 |
@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) |
342 |
return 0; |
343 |
return security_ops->path_chown(path, uid, gid); |
344 |
} |
345 |
+EXPORT_SYMBOL(security_path_chown); |
346 |
|
347 |
int security_path_chroot(struct path *path) |
348 |
{ |
349 |
@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry) |
350 |
return 0; |
351 |
return security_ops->inode_readlink(dentry); |
352 |
} |
353 |
+EXPORT_SYMBOL(security_inode_readlink); |
354 |
|
355 |
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) |
356 |
{ |
357 |
@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask) |
358 |
return 0; |
359 |
return security_ops->inode_permission(inode, mask); |
360 |
} |
361 |
+EXPORT_SYMBOL(security_inode_permission); |
362 |
|
363 |
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |
364 |
{ |
365 |
@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask) |
366 |
|
367 |
return fsnotify_perm(file, mask); |
368 |
} |
369 |
+EXPORT_SYMBOL(security_file_permission); |
370 |
|
371 |
int security_file_alloc(struct file *file) |
372 |
{ |
373 |
@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, |
374 |
return ret; |
375 |
return ima_file_mmap(file, prot); |
376 |
} |
377 |
+EXPORT_SYMBOL(security_file_mmap); |
378 |
|
379 |
int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, |
380 |
unsigned long prot) |