1 |
tommy 10/11/30 21:25:04 |
2 |
|
3 |
Added: aufs2-standalone-36.patch aufs2-base-36.patch |
4 |
Log: |
5 |
Version bump, drop old |
6 |
|
7 |
(Portage version: 2.2.0_alpha6-r1/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sys-fs/aufs2/files/aufs2-standalone-36.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-36.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/files/aufs2-standalone-36.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: aufs2-standalone-36.patch |
16 |
=================================================================== |
17 |
aufs2.1 standalone patch for linux-2.6.36 |
18 |
|
19 |
diff --git a/fs/file_table.c b/fs/file_table.c |
20 |
index a04bdd8..f51588f 100644 |
21 |
--- a/fs/file_table.c |
22 |
+++ b/fs/file_table.c |
23 |
@@ -394,6 +394,8 @@ void file_sb_list_del(struct file *file) |
24 |
} |
25 |
} |
26 |
|
27 |
+EXPORT_SYMBOL(file_sb_list_del); |
28 |
+ |
29 |
#ifdef CONFIG_SMP |
30 |
|
31 |
/* |
32 |
diff --git a/fs/inode.c b/fs/inode.c |
33 |
index 8646433..d84944d 100644 |
34 |
--- a/fs/inode.c |
35 |
+++ b/fs/inode.c |
36 |
@@ -83,6 +83,7 @@ static struct hlist_head *inode_hashtable __read_mostly; |
37 |
* the i_state of an inode while it is in use.. |
38 |
*/ |
39 |
DEFINE_SPINLOCK(inode_lock); |
40 |
+EXPORT_SYMBOL(inode_lock); |
41 |
|
42 |
/* |
43 |
* iprune_sem provides exclusion between the kswapd or try_to_free_pages |
44 |
diff --git a/fs/namei.c b/fs/namei.c |
45 |
index 19d69c5..944842e 100644 |
46 |
--- a/fs/namei.c |
47 |
+++ b/fs/namei.c |
48 |
@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) |
49 |
|
50 |
return 0; |
51 |
} |
52 |
+EXPORT_SYMBOL(deny_write_access); |
53 |
|
54 |
/** |
55 |
* path_get - get a reference to a path |
56 |
@@ -1168,6 +1169,7 @@ struct dentry *lookup_hash(struct nameidata *nd) |
57 |
return ERR_PTR(err); |
58 |
return __lookup_hash(&nd->last, nd->path.dentry, nd); |
59 |
} |
60 |
+EXPORT_SYMBOL(lookup_hash); |
61 |
|
62 |
int __lookup_one_len(const char *name, struct qstr *this, |
63 |
struct dentry *base, int len) |
64 |
@@ -1190,6 +1192,7 @@ int __lookup_one_len(const char *name, struct qstr *this, |
65 |
this->hash = end_name_hash(hash); |
66 |
return 0; |
67 |
} |
68 |
+EXPORT_SYMBOL(__lookup_one_len); |
69 |
|
70 |
/** |
71 |
* lookup_one_len - filesystem helper to lookup single pathname component |
72 |
diff --git a/fs/namespace.c b/fs/namespace.c |
73 |
index a72eaab..36107eb 100644 |
74 |
--- a/fs/namespace.c |
75 |
+++ b/fs/namespace.c |
76 |
@@ -1322,6 +1322,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, |
77 |
} |
78 |
return 0; |
79 |
} |
80 |
+EXPORT_SYMBOL(iterate_mounts); |
81 |
|
82 |
static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) |
83 |
{ |
84 |
diff --git a/fs/notify/group.c b/fs/notify/group.c |
85 |
index d309f38..f0e9568 100644 |
86 |
--- a/fs/notify/group.c |
87 |
+++ b/fs/notify/group.c |
88 |
@@ -22,6 +22,7 @@ |
89 |
#include <linux/srcu.h> |
90 |
#include <linux/rculist.h> |
91 |
#include <linux/wait.h> |
92 |
+#include <linux/module.h> |
93 |
|
94 |
#include <linux/fsnotify_backend.h> |
95 |
#include "fsnotify.h" |
96 |
@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) |
97 |
if (atomic_dec_and_test(&group->refcnt)) |
98 |
fsnotify_destroy_group(group); |
99 |
} |
100 |
+EXPORT_SYMBOL(fsnotify_put_group); |
101 |
|
102 |
/* |
103 |
* Create a new fsnotify_group and hold a reference for the group returned. |
104 |
@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) |
105 |
|
106 |
return group; |
107 |
} |
108 |
+EXPORT_SYMBOL(fsnotify_alloc_group); |
109 |
diff --git a/fs/notify/mark.c b/fs/notify/mark.c |
110 |
index 325185e..adede09 100644 |
111 |
--- a/fs/notify/mark.c |
112 |
+++ b/fs/notify/mark.c |
113 |
@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) |
114 |
if (atomic_dec_and_test(&mark->refcnt)) |
115 |
mark->free_mark(mark); |
116 |
} |
117 |
+EXPORT_SYMBOL(fsnotify_put_mark); |
118 |
|
119 |
/* |
120 |
* Any time a mark is getting freed we end up here. |
121 |
@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) |
122 |
if (unlikely(atomic_dec_and_test(&group->num_marks))) |
123 |
fsnotify_final_destroy_group(group); |
124 |
} |
125 |
+EXPORT_SYMBOL(fsnotify_destroy_mark); |
126 |
|
127 |
void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) |
128 |
{ |
129 |
@@ -277,6 +279,7 @@ err: |
130 |
|
131 |
return ret; |
132 |
} |
133 |
+EXPORT_SYMBOL(fsnotify_add_mark); |
134 |
|
135 |
/* |
136 |
* clear any marks in a group in which mark->flags & flags is true |
137 |
@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, |
138 |
atomic_set(&mark->refcnt, 1); |
139 |
mark->free_mark = free_mark; |
140 |
} |
141 |
+EXPORT_SYMBOL(fsnotify_init_mark); |
142 |
|
143 |
static int fsnotify_mark_destroy(void *ignored) |
144 |
{ |
145 |
diff --git a/fs/open.c b/fs/open.c |
146 |
index d74e198..53ef25e 100644 |
147 |
--- a/fs/open.c |
148 |
+++ b/fs/open.c |
149 |
@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, |
150 |
mutex_unlock(&dentry->d_inode->i_mutex); |
151 |
return ret; |
152 |
} |
153 |
+EXPORT_SYMBOL(do_truncate); |
154 |
|
155 |
static long do_sys_truncate(const char __user *pathname, loff_t length) |
156 |
{ |
157 |
diff --git a/fs/splice.c b/fs/splice.c |
158 |
index 278c94f..033f7ac 100644 |
159 |
--- a/fs/splice.c |
160 |
+++ b/fs/splice.c |
161 |
@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
162 |
|
163 |
return splice_write(pipe, out, ppos, len, flags); |
164 |
} |
165 |
+EXPORT_SYMBOL(do_splice_from); |
166 |
|
167 |
/* |
168 |
* Attempt to initiate a splice from a file to a pipe. |
169 |
@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos, |
170 |
|
171 |
return splice_read(in, ppos, pipe, len, flags); |
172 |
} |
173 |
+EXPORT_SYMBOL(do_splice_to); |
174 |
|
175 |
/** |
176 |
* splice_direct_to_actor - splices data directly between two non-pipes |
177 |
diff --git a/security/commoncap.c b/security/commoncap.c |
178 |
index 9d172e6..8a61084 100644 |
179 |
--- a/security/commoncap.c |
180 |
+++ b/security/commoncap.c |
181 |
@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, |
182 |
} |
183 |
return ret; |
184 |
} |
185 |
+EXPORT_SYMBOL(cap_file_mmap); |
186 |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c |
187 |
index 8d9c48f..29108aa 100644 |
188 |
--- a/security/device_cgroup.c |
189 |
+++ b/security/device_cgroup.c |
190 |
@@ -515,6 +515,7 @@ found: |
191 |
|
192 |
return -EPERM; |
193 |
} |
194 |
+EXPORT_SYMBOL(devcgroup_inode_permission); |
195 |
|
196 |
int devcgroup_inode_mknod(int mode, dev_t dev) |
197 |
{ |
198 |
diff --git a/security/security.c b/security/security.c |
199 |
index c53949f..0ae5b91 100644 |
200 |
--- a/security/security.c |
201 |
+++ b/security/security.c |
202 |
@@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) |
203 |
return 0; |
204 |
return security_ops->path_mkdir(dir, dentry, mode); |
205 |
} |
206 |
+EXPORT_SYMBOL(security_path_mkdir); |
207 |
|
208 |
int security_path_rmdir(struct path *dir, struct dentry *dentry) |
209 |
{ |
210 |
@@ -383,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) |
211 |
return 0; |
212 |
return security_ops->path_rmdir(dir, dentry); |
213 |
} |
214 |
+EXPORT_SYMBOL(security_path_rmdir); |
215 |
|
216 |
int security_path_unlink(struct path *dir, struct dentry *dentry) |
217 |
{ |
218 |
@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) |
219 |
return 0; |
220 |
return security_ops->path_unlink(dir, dentry); |
221 |
} |
222 |
+EXPORT_SYMBOL(security_path_unlink); |
223 |
|
224 |
int security_path_symlink(struct path *dir, struct dentry *dentry, |
225 |
const char *old_name) |
226 |
@@ -398,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, |
227 |
return 0; |
228 |
return security_ops->path_symlink(dir, dentry, old_name); |
229 |
} |
230 |
+EXPORT_SYMBOL(security_path_symlink); |
231 |
|
232 |
int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
233 |
struct dentry *new_dentry) |
234 |
@@ -406,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
235 |
return 0; |
236 |
return security_ops->path_link(old_dentry, new_dir, new_dentry); |
237 |
} |
238 |
+EXPORT_SYMBOL(security_path_link); |
239 |
|
240 |
int security_path_rename(struct path *old_dir, struct dentry *old_dentry, |
241 |
struct path *new_dir, struct dentry *new_dentry) |
242 |
@@ -416,6 +421,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, |
243 |
return security_ops->path_rename(old_dir, old_dentry, new_dir, |
244 |
new_dentry); |
245 |
} |
246 |
+EXPORT_SYMBOL(security_path_rename); |
247 |
|
248 |
int security_path_truncate(struct path *path) |
249 |
{ |
250 |
@@ -423,6 +429,7 @@ int security_path_truncate(struct path *path) |
251 |
return 0; |
252 |
return security_ops->path_truncate(path); |
253 |
} |
254 |
+EXPORT_SYMBOL(security_path_truncate); |
255 |
|
256 |
int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, |
257 |
mode_t mode) |
258 |
@@ -431,6 +438,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, |
259 |
return 0; |
260 |
return security_ops->path_chmod(dentry, mnt, mode); |
261 |
} |
262 |
+EXPORT_SYMBOL(security_path_chmod); |
263 |
|
264 |
int security_path_chown(struct path *path, uid_t uid, gid_t gid) |
265 |
{ |
266 |
@@ -438,6 +446,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) |
267 |
return 0; |
268 |
return security_ops->path_chown(path, uid, gid); |
269 |
} |
270 |
+EXPORT_SYMBOL(security_path_chown); |
271 |
|
272 |
int security_path_chroot(struct path *path) |
273 |
{ |
274 |
@@ -514,6 +523,7 @@ int security_inode_readlink(struct dentry *dentry) |
275 |
return 0; |
276 |
return security_ops->inode_readlink(dentry); |
277 |
} |
278 |
+EXPORT_SYMBOL(security_inode_readlink); |
279 |
|
280 |
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) |
281 |
{ |
282 |
@@ -528,6 +538,7 @@ int security_inode_permission(struct inode *inode, int mask) |
283 |
return 0; |
284 |
return security_ops->inode_permission(inode, mask); |
285 |
} |
286 |
+EXPORT_SYMBOL(security_inode_permission); |
287 |
|
288 |
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |
289 |
{ |
290 |
@@ -627,6 +638,7 @@ int security_file_permission(struct file *file, int mask) |
291 |
|
292 |
return fsnotify_perm(file, mask); |
293 |
} |
294 |
+EXPORT_SYMBOL(security_file_permission); |
295 |
|
296 |
int security_file_alloc(struct file *file) |
297 |
{ |
298 |
@@ -654,6 +666,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, |
299 |
return ret; |
300 |
return ima_file_mmap(file, prot); |
301 |
} |
302 |
+EXPORT_SYMBOL(security_file_mmap); |
303 |
|
304 |
int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, |
305 |
unsigned long prot) |
306 |
|
307 |
|
308 |
|
309 |
1.1 sys-fs/aufs2/files/aufs2-base-36.patch |
310 |
|
311 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/files/aufs2-base-36.patch?rev=1.1&view=markup |
312 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/files/aufs2-base-36.patch?rev=1.1&content-type=text/plain |
313 |
|
314 |
Index: aufs2-base-36.patch |
315 |
=================================================================== |
316 |
aufs2.1 base patch for linux-2.6.36 |
317 |
|
318 |
diff --git a/fs/namei.c b/fs/namei.c |
319 |
index 24896e8..19d69c5 100644 |
320 |
--- a/fs/namei.c |
321 |
+++ b/fs/namei.c |
322 |
@@ -1159,7 +1159,7 @@ out: |
323 |
* needs parent already locked. Doesn't follow mounts. |
324 |
* SMP-safe. |
325 |
*/ |
326 |
-static struct dentry *lookup_hash(struct nameidata *nd) |
327 |
+struct dentry *lookup_hash(struct nameidata *nd) |
328 |
{ |
329 |
int err; |
330 |
|
331 |
@@ -1169,7 +1169,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) |
332 |
return __lookup_hash(&nd->last, nd->path.dentry, nd); |
333 |
} |
334 |
|
335 |
-static int __lookup_one_len(const char *name, struct qstr *this, |
336 |
+int __lookup_one_len(const char *name, struct qstr *this, |
337 |
struct dentry *base, int len) |
338 |
{ |
339 |
unsigned long hash; |
340 |
diff --git a/fs/splice.c b/fs/splice.c |
341 |
index 8f1dfae..278c94f 100644 |
342 |
--- a/fs/splice.c |
343 |
+++ b/fs/splice.c |
344 |
@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); |
345 |
/* |
346 |
* Attempt to initiate a splice from pipe to file. |
347 |
*/ |
348 |
-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
349 |
- loff_t *ppos, size_t len, unsigned int flags) |
350 |
+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
351 |
+ loff_t *ppos, size_t len, unsigned int flags) |
352 |
{ |
353 |
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, |
354 |
loff_t *, size_t, unsigned int); |
355 |
@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
356 |
/* |
357 |
* Attempt to initiate a splice from a file to a pipe. |
358 |
*/ |
359 |
-static long do_splice_to(struct file *in, loff_t *ppos, |
360 |
- struct pipe_inode_info *pipe, size_t len, |
361 |
- unsigned int flags) |
362 |
+long do_splice_to(struct file *in, loff_t *ppos, |
363 |
+ struct pipe_inode_info *pipe, size_t len, |
364 |
+ unsigned int flags) |
365 |
{ |
366 |
ssize_t (*splice_read)(struct file *, loff_t *, |
367 |
struct pipe_inode_info *, size_t, unsigned int); |
368 |
diff --git a/include/linux/namei.h b/include/linux/namei.h |
369 |
index 05b441d..91bc74e 100644 |
370 |
--- a/include/linux/namei.h |
371 |
+++ b/include/linux/namei.h |
372 |
@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, |
373 |
extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, |
374 |
int (*open)(struct inode *, struct file *)); |
375 |
|
376 |
+extern struct dentry *lookup_hash(struct nameidata *nd); |
377 |
+extern int __lookup_one_len(const char *name, struct qstr *this, |
378 |
+ struct dentry *base, int len); |
379 |
extern struct dentry *lookup_one_len(const char *, struct dentry *, int); |
380 |
|
381 |
extern int follow_down(struct path *); |
382 |
diff --git a/include/linux/splice.h b/include/linux/splice.h |
383 |
index 997c3b4..be9a153 100644 |
384 |
--- a/include/linux/splice.h |
385 |
+++ b/include/linux/splice.h |
386 |
@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); |
387 |
extern void splice_shrink_spd(struct pipe_inode_info *, |
388 |
struct splice_pipe_desc *); |
389 |
|
390 |
+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
391 |
+ loff_t *ppos, size_t len, unsigned int flags); |
392 |
+extern long do_splice_to(struct file *in, loff_t *ppos, |
393 |
+ struct pipe_inode_info *pipe, size_t len, |
394 |
+ unsigned int flags); |
395 |
+ |
396 |
#endif |