1 |
tommy 10/04/05 12:37:30 |
2 |
|
3 |
Modified: aufs2-standalone-31.patch aufs2-standalone-33.patch |
4 |
aufs2-standalone-32.patch |
5 |
Log: |
6 |
Version bump |
7 |
(Portage version: 2.2_rc67-r3/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 sys-fs/aufs2/files/aufs2-standalone-31.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-31.patch?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-31.patch?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-31.patch?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: aufs2-standalone-31.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-31.patch,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- aufs2-standalone-31.patch 16 Mar 2010 20:12:06 -0000 1.2 |
23 |
+++ aufs2-standalone-31.patch 5 Apr 2010 12:37:30 -0000 1.3 |
24 |
@@ -40,6 +40,75 @@ |
25 |
|
26 |
static int event; |
27 |
static DEFINE_IDA(mnt_id_ida); |
28 |
+diff --git a/fs/notify/group.c b/fs/notify/group.c |
29 |
+index 0e16771..3fab10a 100644 |
30 |
+--- a/fs/notify/group.c |
31 |
++++ b/fs/notify/group.c |
32 |
+@@ -22,6 +22,7 @@ |
33 |
+ #include <linux/srcu.h> |
34 |
+ #include <linux/rculist.h> |
35 |
+ #include <linux/wait.h> |
36 |
++#include <linux/module.h> |
37 |
+ |
38 |
+ #include <linux/fsnotify_backend.h> |
39 |
+ #include "fsnotify.h" |
40 |
+@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) |
41 |
+ fsnotify_recalc_global_mask(); |
42 |
+ fsnotify_destroy_group(group); |
43 |
+ } |
44 |
++EXPORT_SYMBOL(fsnotify_put_group); |
45 |
+ |
46 |
+ /* |
47 |
+ * Simply run the fsnotify_groups list and find a group which matches |
48 |
+@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, |
49 |
+ |
50 |
+ return group; |
51 |
+ } |
52 |
++EXPORT_SYMBOL(fsnotify_obtain_group); |
53 |
+diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c |
54 |
+index c8a07c6..c5a229b 100644 |
55 |
+--- a/fs/notify/inode_mark.c |
56 |
++++ b/fs/notify/inode_mark.c |
57 |
+@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) |
58 |
+ if (atomic_dec_and_test(&entry->refcnt)) |
59 |
+ entry->free_mark(entry); |
60 |
+ } |
61 |
++EXPORT_SYMBOL(fsnotify_put_mark); |
62 |
+ |
63 |
+ /* |
64 |
+ * Recalculate the mask of events relevant to a given inode locked. |
65 |
+@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) |
66 |
+ if (unlikely(atomic_dec_and_test(&group->num_marks))) |
67 |
+ fsnotify_final_destroy_group(group); |
68 |
+ } |
69 |
++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); |
70 |
+ |
71 |
+ /* |
72 |
+ * Given a group, destroy all of the marks associated with that group. |
73 |
+@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou |
74 |
+ } |
75 |
+ return NULL; |
76 |
+ } |
77 |
++EXPORT_SYMBOL(fsnotify_find_mark_entry); |
78 |
+ |
79 |
+ /* |
80 |
+ * Nothing fancy, just initialize lists and locks and counters. |
81 |
+@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, |
82 |
+ entry->inode = NULL; |
83 |
+ entry->free_mark = free_mark; |
84 |
+ } |
85 |
++EXPORT_SYMBOL(fsnotify_init_mark); |
86 |
+ |
87 |
+ /* |
88 |
+ * Attach an initialized mark entry to a given group and inode. |
89 |
+@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, |
90 |
+ |
91 |
+ return ret; |
92 |
+ } |
93 |
++EXPORT_SYMBOL(fsnotify_add_mark); |
94 |
+ |
95 |
+ /** |
96 |
+ * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. |
97 |
diff --git a/fs/open.c b/fs/open.c |
98 |
index dd98e80..04b9aad 100644 |
99 |
--- a/fs/open.c |
100 |
|
101 |
|
102 |
|
103 |
1.2 sys-fs/aufs2/files/aufs2-standalone-33.patch |
104 |
|
105 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-33.patch?rev=1.2&view=markup |
106 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-33.patch?rev=1.2&content-type=text/plain |
107 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-33.patch?r1=1.1&r2=1.2 |
108 |
|
109 |
Index: aufs2-standalone-33.patch |
110 |
=================================================================== |
111 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-33.patch,v |
112 |
retrieving revision 1.1 |
113 |
retrieving revision 1.2 |
114 |
diff -u -r1.1 -r1.2 |
115 |
--- aufs2-standalone-33.patch 14 Mar 2010 20:23:44 -0000 1.1 |
116 |
+++ aufs2-standalone-33.patch 5 Apr 2010 12:37:30 -0000 1.2 |
117 |
@@ -40,6 +40,75 @@ |
118 |
|
119 |
static int event; |
120 |
static DEFINE_IDA(mnt_id_ida); |
121 |
+diff --git a/fs/notify/group.c b/fs/notify/group.c |
122 |
+index 0e16771..3fab10a 100644 |
123 |
+--- a/fs/notify/group.c |
124 |
++++ b/fs/notify/group.c |
125 |
+@@ -22,6 +22,7 @@ |
126 |
+ #include <linux/srcu.h> |
127 |
+ #include <linux/rculist.h> |
128 |
+ #include <linux/wait.h> |
129 |
++#include <linux/module.h> |
130 |
+ |
131 |
+ #include <linux/fsnotify_backend.h> |
132 |
+ #include "fsnotify.h" |
133 |
+@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) |
134 |
+ fsnotify_recalc_global_mask(); |
135 |
+ fsnotify_destroy_group(group); |
136 |
+ } |
137 |
++EXPORT_SYMBOL(fsnotify_put_group); |
138 |
+ |
139 |
+ /* |
140 |
+ * Simply run the fsnotify_groups list and find a group which matches |
141 |
+@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, |
142 |
+ |
143 |
+ return group; |
144 |
+ } |
145 |
++EXPORT_SYMBOL(fsnotify_obtain_group); |
146 |
+diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c |
147 |
+index 3165d85..4586162 100644 |
148 |
+--- a/fs/notify/inode_mark.c |
149 |
++++ b/fs/notify/inode_mark.c |
150 |
+@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) |
151 |
+ if (atomic_dec_and_test(&entry->refcnt)) |
152 |
+ entry->free_mark(entry); |
153 |
+ } |
154 |
++EXPORT_SYMBOL(fsnotify_put_mark); |
155 |
+ |
156 |
+ /* |
157 |
+ * Recalculate the mask of events relevant to a given inode locked. |
158 |
+@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) |
159 |
+ if (unlikely(atomic_dec_and_test(&group->num_marks))) |
160 |
+ fsnotify_final_destroy_group(group); |
161 |
+ } |
162 |
++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); |
163 |
+ |
164 |
+ /* |
165 |
+ * Given a group, destroy all of the marks associated with that group. |
166 |
+@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou |
167 |
+ } |
168 |
+ return NULL; |
169 |
+ } |
170 |
++EXPORT_SYMBOL(fsnotify_find_mark_entry); |
171 |
+ |
172 |
+ /* |
173 |
+ * Nothing fancy, just initialize lists and locks and counters. |
174 |
+@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, |
175 |
+ entry->inode = NULL; |
176 |
+ entry->free_mark = free_mark; |
177 |
+ } |
178 |
++EXPORT_SYMBOL(fsnotify_init_mark); |
179 |
+ |
180 |
+ /* |
181 |
+ * Attach an initialized mark entry to a given group and inode. |
182 |
+@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, |
183 |
+ |
184 |
+ return ret; |
185 |
+ } |
186 |
++EXPORT_SYMBOL(fsnotify_add_mark); |
187 |
+ |
188 |
+ /** |
189 |
+ * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. |
190 |
diff --git a/fs/open.c b/fs/open.c |
191 |
index 040cef7..453b782 100644 |
192 |
--- a/fs/open.c |
193 |
|
194 |
|
195 |
|
196 |
1.2 sys-fs/aufs2/files/aufs2-standalone-32.patch |
197 |
|
198 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-32.patch?rev=1.2&view=markup |
199 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-32.patch?rev=1.2&content-type=text/plain |
200 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-32.patch?r1=1.1&r2=1.2 |
201 |
|
202 |
Index: aufs2-standalone-32.patch |
203 |
=================================================================== |
204 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-32.patch,v |
205 |
retrieving revision 1.1 |
206 |
retrieving revision 1.2 |
207 |
diff -u -r1.1 -r1.2 |
208 |
--- aufs2-standalone-32.patch 18 Dec 2009 17:32:10 -0000 1.1 |
209 |
+++ aufs2-standalone-32.patch 5 Apr 2010 12:37:30 -0000 1.2 |
210 |
@@ -40,6 +40,75 @@ |
211 |
|
212 |
static int event; |
213 |
static DEFINE_IDA(mnt_id_ida); |
214 |
+diff --git a/fs/notify/group.c b/fs/notify/group.c |
215 |
+index 0e16771..3fab10a 100644 |
216 |
+--- a/fs/notify/group.c |
217 |
++++ b/fs/notify/group.c |
218 |
+@@ -22,6 +22,7 @@ |
219 |
+ #include <linux/srcu.h> |
220 |
+ #include <linux/rculist.h> |
221 |
+ #include <linux/wait.h> |
222 |
++#include <linux/module.h> |
223 |
+ |
224 |
+ #include <linux/fsnotify_backend.h> |
225 |
+ #include "fsnotify.h" |
226 |
+@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) |
227 |
+ fsnotify_recalc_global_mask(); |
228 |
+ fsnotify_destroy_group(group); |
229 |
+ } |
230 |
++EXPORT_SYMBOL(fsnotify_put_group); |
231 |
+ |
232 |
+ /* |
233 |
+ * Simply run the fsnotify_groups list and find a group which matches |
234 |
+@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, |
235 |
+ |
236 |
+ return group; |
237 |
+ } |
238 |
++EXPORT_SYMBOL(fsnotify_obtain_group); |
239 |
+diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c |
240 |
+index 3165d85..4586162 100644 |
241 |
+--- a/fs/notify/inode_mark.c |
242 |
++++ b/fs/notify/inode_mark.c |
243 |
+@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) |
244 |
+ if (atomic_dec_and_test(&entry->refcnt)) |
245 |
+ entry->free_mark(entry); |
246 |
+ } |
247 |
++EXPORT_SYMBOL(fsnotify_put_mark); |
248 |
+ |
249 |
+ /* |
250 |
+ * Recalculate the mask of events relevant to a given inode locked. |
251 |
+@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) |
252 |
+ if (unlikely(atomic_dec_and_test(&group->num_marks))) |
253 |
+ fsnotify_final_destroy_group(group); |
254 |
+ } |
255 |
++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); |
256 |
+ |
257 |
+ /* |
258 |
+ * Given a group, destroy all of the marks associated with that group. |
259 |
+@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou |
260 |
+ } |
261 |
+ return NULL; |
262 |
+ } |
263 |
++EXPORT_SYMBOL(fsnotify_find_mark_entry); |
264 |
+ |
265 |
+ /* |
266 |
+ * Nothing fancy, just initialize lists and locks and counters. |
267 |
+@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, |
268 |
+ entry->inode = NULL; |
269 |
+ entry->free_mark = free_mark; |
270 |
+ } |
271 |
++EXPORT_SYMBOL(fsnotify_init_mark); |
272 |
+ |
273 |
+ /* |
274 |
+ * Attach an initialized mark entry to a given group and inode. |
275 |
+@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, |
276 |
+ |
277 |
+ return ret; |
278 |
+ } |
279 |
++EXPORT_SYMBOL(fsnotify_add_mark); |
280 |
+ |
281 |
+ /** |
282 |
+ * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. |
283 |
diff --git a/fs/open.c b/fs/open.c |
284 |
index 4f01e06..ef09031 100644 |
285 |
--- a/fs/open.c |
286 |
@@ -72,6 +141,15 @@ |
287 |
|
288 |
/** |
289 |
* splice_direct_to_actor - splices data directly between two non-pipes |
290 |
+diff --git a/security/commoncap.c b/security/commoncap.c |
291 |
+index fe30751..813108d 100644 |
292 |
+--- a/security/commoncap.c |
293 |
++++ b/security/commoncap.c |
294 |
+@@ -1014,3 +1014,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, |
295 |
+ } |
296 |
+ return ret; |
297 |
+ } |
298 |
++EXPORT_SYMBOL(cap_file_mmap); |
299 |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c |
300 |
index 6cf8fd2..008e0d8 100644 |
301 |
--- a/security/device_cgroup.c |
302 |
@@ -97,7 +175,7 @@ |
303 |
/** |
304 |
* ima_bprm_check - based on policy, collect/store measurement. |
305 |
diff --git a/security/security.c b/security/security.c |
306 |
-index c4c6732..854d15c 100644 |
307 |
+index c4c6732..092cd90 100644 |
308 |
--- a/security/security.c |
309 |
+++ b/security/security.c |
310 |
@@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode) |
311 |
@@ -180,3 +258,11 @@ |
312 |
|
313 |
int security_file_alloc(struct file *file) |
314 |
{ |
315 |
+@@ -641,6 +651,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, |
316 |
+ { |
317 |
+ return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only); |
318 |
+ } |
319 |
++EXPORT_SYMBOL(security_file_mmap); |
320 |
+ |
321 |
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, |
322 |
+ unsigned long prot) |