1 |
jlec 12/06/19 18:56:35 |
2 |
|
3 |
Modified: aufs3-standalone-x-rcN.patch aufs3-base-x-rcN.patch |
4 |
Log: |
5 |
sys-fs/aufs3: Version BUmp |
6 |
|
7 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: aufs3-standalone-x-rcN.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- aufs3-standalone-x-rcN.patch 30 Apr 2012 06:03:49 -0000 1.4 |
23 |
+++ aufs3-standalone-x-rcN.patch 19 Jun 2012 18:56:35 -0000 1.5 |
24 |
@@ -1,10 +1,18 @@ |
25 |
aufs3.x-rcN standalone patch |
26 |
|
27 |
diff --git a/fs/file_table.c b/fs/file_table.c |
28 |
-index 70f2a0f..146a3d7 100644 |
29 |
+index a305d9e..6a768be 100644 |
30 |
--- a/fs/file_table.c |
31 |
+++ b/fs/file_table.c |
32 |
-@@ -442,6 +442,8 @@ void file_sb_list_del(struct file *file) |
33 |
+@@ -35,6 +35,7 @@ struct files_stat_struct files_stat = { |
34 |
+ }; |
35 |
+ |
36 |
+ DEFINE_LGLOCK(files_lglock); |
37 |
++EXPORT_SYMBOL(files_lglock); |
38 |
+ |
39 |
+ /* SLAB cache for file structures */ |
40 |
+ static struct kmem_cache *filp_cachep __read_mostly; |
41 |
+@@ -441,6 +442,8 @@ void file_sb_list_del(struct file *file) |
42 |
} |
43 |
} |
44 |
|
45 |
@@ -14,7 +22,7 @@ |
46 |
|
47 |
/* |
48 |
diff --git a/fs/inode.c b/fs/inode.c |
49 |
-index 9f4f5fe..bb0f3ba 100644 |
50 |
+index 7f772fd..e789d2f 100644 |
51 |
--- a/fs/inode.c |
52 |
+++ b/fs/inode.c |
53 |
@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; |
54 |
@@ -25,11 +33,19 @@ |
55 |
|
56 |
/* |
57 |
* Empty aops. Can be used for the cases where the user does not |
58 |
+@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) |
59 |
+ mark_inode_dirty_sync(inode); |
60 |
+ return 0; |
61 |
+ } |
62 |
++EXPORT_SYMBOL(update_time); |
63 |
+ |
64 |
+ /** |
65 |
+ * touch_atime - update the access time |
66 |
diff --git a/fs/namei.c b/fs/namei.c |
67 |
-index 80bb0b9..3430ad3 100644 |
68 |
+index 18c9782..f09edf3 100644 |
69 |
--- a/fs/namei.c |
70 |
+++ b/fs/namei.c |
71 |
-@@ -1835,6 +1835,7 @@ struct dentry *lookup_hash(struct nameidata *nd) |
72 |
+@@ -1868,6 +1868,7 @@ struct dentry *lookup_hash(struct nameidata *nd) |
73 |
{ |
74 |
return __lookup_hash(&nd->last, nd->path.dentry, nd); |
75 |
} |
76 |
@@ -38,10 +54,18 @@ |
77 |
/** |
78 |
* lookup_one_len - filesystem helper to lookup single pathname component |
79 |
diff --git a/fs/namespace.c b/fs/namespace.c |
80 |
-index e608199..38fcc2e 100644 |
81 |
+index 1e4a5fe..06aa768 100644 |
82 |
--- a/fs/namespace.c |
83 |
+++ b/fs/namespace.c |
84 |
-@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, |
85 |
+@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); |
86 |
+ * tree or hash is modified or when a vfsmount structure is modified. |
87 |
+ */ |
88 |
+ DEFINE_BRLOCK(vfsmount_lock); |
89 |
++EXPORT_SYMBOL(vfsmount_lock); |
90 |
+ |
91 |
+ static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) |
92 |
+ { |
93 |
+@@ -1341,6 +1342,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, |
94 |
} |
95 |
return 0; |
96 |
} |
97 |
@@ -111,7 +135,7 @@ |
98 |
static int fsnotify_mark_destroy(void *ignored) |
99 |
{ |
100 |
diff --git a/fs/open.c b/fs/open.c |
101 |
-index 5720854..ec59242 100644 |
102 |
+index d6c79a0..9004a15 100644 |
103 |
--- a/fs/open.c |
104 |
+++ b/fs/open.c |
105 |
@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, |
106 |
@@ -123,10 +147,10 @@ |
107 |
static long do_sys_truncate(const char __user *pathname, loff_t length) |
108 |
{ |
109 |
diff --git a/fs/splice.c b/fs/splice.c |
110 |
-index f871233..70f5481 100644 |
111 |
+index 490239f..701d34a 100644 |
112 |
--- a/fs/splice.c |
113 |
+++ b/fs/splice.c |
114 |
-@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
115 |
+@@ -1110,6 +1110,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
116 |
|
117 |
return splice_write(pipe, out, ppos, len, flags); |
118 |
} |
119 |
@@ -134,7 +158,7 @@ |
120 |
|
121 |
/* |
122 |
* Attempt to initiate a splice from a file to a pipe. |
123 |
-@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos, |
124 |
+@@ -1136,6 +1137,7 @@ long do_splice_to(struct file *in, loff_t *ppos, |
125 |
|
126 |
return splice_read(in, ppos, pipe, len, flags); |
127 |
} |
128 |
@@ -143,16 +167,23 @@ |
129 |
/** |
130 |
* splice_direct_to_actor - splices data directly between two non-pipes |
131 |
diff --git a/security/commoncap.c b/security/commoncap.c |
132 |
-index 71a166a..5d63aac 100644 |
133 |
+index 6dbae46..9f4f29a 100644 |
134 |
--- a/security/commoncap.c |
135 |
+++ b/security/commoncap.c |
136 |
-@@ -972,3 +972,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, |
137 |
+@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr) |
138 |
} |
139 |
return ret; |
140 |
} |
141 |
-+EXPORT_SYMBOL(cap_file_mmap); |
142 |
++EXPORT_SYMBOL(cap_mmap_addr); |
143 |
+ |
144 |
+ int cap_mmap_file(struct file *file, unsigned long reqprot, |
145 |
+ unsigned long prot, unsigned long flags) |
146 |
+ { |
147 |
+ return 0; |
148 |
+ } |
149 |
++EXPORT_SYMBOL(cap_mmap_file); |
150 |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c |
151 |
-index c43a332..0c37289 100644 |
152 |
+index 442204c..e644a1c 100644 |
153 |
--- a/security/device_cgroup.c |
154 |
+++ b/security/device_cgroup.c |
155 |
@@ -7,6 +7,7 @@ |
156 |
@@ -163,7 +194,7 @@ |
157 |
#include <linux/list.h> |
158 |
#include <linux/uaccess.h> |
159 |
#include <linux/seq_file.h> |
160 |
-@@ -499,6 +500,7 @@ found: |
161 |
+@@ -493,6 +494,7 @@ found: |
162 |
|
163 |
return -EPERM; |
164 |
} |
165 |
@@ -172,10 +203,10 @@ |
166 |
int devcgroup_inode_mknod(int mode, dev_t dev) |
167 |
{ |
168 |
diff --git a/security/security.c b/security/security.c |
169 |
-index bf619ff..60b996a 100644 |
170 |
+index 3efc9b1..c7afd35 100644 |
171 |
--- a/security/security.c |
172 |
+++ b/security/security.c |
173 |
-@@ -380,6 +380,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) |
174 |
+@@ -383,6 +383,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) |
175 |
return 0; |
176 |
return security_ops->path_rmdir(dir, dentry); |
177 |
} |
178 |
@@ -183,7 +214,7 @@ |
179 |
|
180 |
int security_path_unlink(struct path *dir, struct dentry *dentry) |
181 |
{ |
182 |
-@@ -396,6 +397,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, |
183 |
+@@ -399,6 +400,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, |
184 |
return 0; |
185 |
return security_ops->path_symlink(dir, dentry, old_name); |
186 |
} |
187 |
@@ -191,7 +222,7 @@ |
188 |
|
189 |
int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
190 |
struct dentry *new_dentry) |
191 |
-@@ -404,6 +406,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
192 |
+@@ -407,6 +409,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, |
193 |
return 0; |
194 |
return security_ops->path_link(old_dentry, new_dir, new_dentry); |
195 |
} |
196 |
@@ -199,7 +230,7 @@ |
197 |
|
198 |
int security_path_rename(struct path *old_dir, struct dentry *old_dentry, |
199 |
struct path *new_dir, struct dentry *new_dentry) |
200 |
-@@ -422,6 +425,7 @@ int security_path_truncate(struct path *path) |
201 |
+@@ -425,6 +428,7 @@ int security_path_truncate(struct path *path) |
202 |
return 0; |
203 |
return security_ops->path_truncate(path); |
204 |
} |
205 |
@@ -207,7 +238,7 @@ |
206 |
|
207 |
int security_path_chmod(struct path *path, umode_t mode) |
208 |
{ |
209 |
-@@ -429,6 +433,7 @@ int security_path_chmod(struct path *path, umode_t mode) |
210 |
+@@ -432,6 +436,7 @@ int security_path_chmod(struct path *path, umode_t mode) |
211 |
return 0; |
212 |
return security_ops->path_chmod(path, mode); |
213 |
} |
214 |
@@ -215,7 +246,7 @@ |
215 |
|
216 |
int security_path_chown(struct path *path, uid_t uid, gid_t gid) |
217 |
{ |
218 |
-@@ -436,6 +441,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) |
219 |
+@@ -439,6 +444,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) |
220 |
return 0; |
221 |
return security_ops->path_chown(path, uid, gid); |
222 |
} |
223 |
@@ -223,7 +254,7 @@ |
224 |
|
225 |
int security_path_chroot(struct path *path) |
226 |
{ |
227 |
-@@ -512,6 +518,7 @@ int security_inode_readlink(struct dentry *dentry) |
228 |
+@@ -515,6 +521,7 @@ int security_inode_readlink(struct dentry *dentry) |
229 |
return 0; |
230 |
return security_ops->inode_readlink(dentry); |
231 |
} |
232 |
@@ -231,7 +262,7 @@ |
233 |
|
234 |
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) |
235 |
{ |
236 |
-@@ -526,6 +533,7 @@ int security_inode_permission(struct inode *inode, int mask) |
237 |
+@@ -529,6 +536,7 @@ int security_inode_permission(struct inode *inode, int mask) |
238 |
return 0; |
239 |
return security_ops->inode_permission(inode, mask); |
240 |
} |
241 |
@@ -239,7 +270,7 @@ |
242 |
|
243 |
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |
244 |
{ |
245 |
-@@ -641,6 +649,7 @@ int security_file_permission(struct file *file, int mask) |
246 |
+@@ -644,6 +652,7 @@ int security_file_permission(struct file *file, int mask) |
247 |
|
248 |
return fsnotify_perm(file, mask); |
249 |
} |
250 |
@@ -247,11 +278,11 @@ |
251 |
|
252 |
int security_file_alloc(struct file *file) |
253 |
{ |
254 |
-@@ -668,6 +677,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, |
255 |
+@@ -704,6 +713,7 @@ int security_mmap_file(struct file *file, unsigned long prot, |
256 |
return ret; |
257 |
return ima_file_mmap(file, prot); |
258 |
} |
259 |
-+EXPORT_SYMBOL(security_file_mmap); |
260 |
++EXPORT_SYMBOL(security_mmap_file); |
261 |
|
262 |
- int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, |
263 |
- unsigned long prot) |
264 |
+ int security_mmap_addr(unsigned long addr) |
265 |
+ { |
266 |
|
267 |
|
268 |
|
269 |
1.5 sys-fs/aufs3/files/aufs3-base-x-rcN.patch |
270 |
|
271 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-base-x-rcN.patch?rev=1.5&view=markup |
272 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-base-x-rcN.patch?rev=1.5&content-type=text/plain |
273 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/files/aufs3-base-x-rcN.patch?r1=1.4&r2=1.5 |
274 |
|
275 |
Index: aufs3-base-x-rcN.patch |
276 |
=================================================================== |
277 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs3/files/aufs3-base-x-rcN.patch,v |
278 |
retrieving revision 1.4 |
279 |
retrieving revision 1.5 |
280 |
diff -u -r1.4 -r1.5 |
281 |
--- aufs3-base-x-rcN.patch 30 Apr 2012 06:03:49 -0000 1.4 |
282 |
+++ aufs3-base-x-rcN.patch 19 Jun 2012 18:56:35 -0000 1.5 |
283 |
@@ -1,10 +1,23 @@ |
284 |
aufs3.x-rcN base patch |
285 |
|
286 |
+diff --git a/fs/inode.c b/fs/inode.c |
287 |
+index c99163b..7f772fd 100644 |
288 |
+--- a/fs/inode.c |
289 |
++++ b/fs/inode.c |
290 |
+@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, |
291 |
+ * This does the actual work of updating an inodes time or version. Must have |
292 |
+ * had called mnt_want_write() before calling this. |
293 |
+ */ |
294 |
+-static int update_time(struct inode *inode, struct timespec *time, int flags) |
295 |
++int update_time(struct inode *inode, struct timespec *time, int flags) |
296 |
+ { |
297 |
+ if (inode->i_op->update_time) |
298 |
+ return inode->i_op->update_time(inode, time, flags); |
299 |
diff --git a/fs/namei.c b/fs/namei.c |
300 |
-index 0062dd1..80bb0b9 100644 |
301 |
+index 7d69419..18c9782 100644 |
302 |
--- a/fs/namei.c |
303 |
+++ b/fs/namei.c |
304 |
-@@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, |
305 |
+@@ -1864,7 +1864,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, |
306 |
* needs parent already locked. Doesn't follow mounts. |
307 |
* SMP-safe. |
308 |
*/ |
309 |
@@ -14,10 +27,10 @@ |
310 |
return __lookup_hash(&nd->last, nd->path.dentry, nd); |
311 |
} |
312 |
diff --git a/fs/splice.c b/fs/splice.c |
313 |
-index f847684..f871233 100644 |
314 |
+index c9f1318..490239f 100644 |
315 |
--- a/fs/splice.c |
316 |
+++ b/fs/splice.c |
317 |
-@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); |
318 |
+@@ -1086,8 +1086,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); |
319 |
/* |
320 |
* Attempt to initiate a splice from pipe to file. |
321 |
*/ |
322 |
@@ -28,7 +41,7 @@ |
323 |
{ |
324 |
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, |
325 |
loff_t *, size_t, unsigned int); |
326 |
-@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
327 |
+@@ -1114,9 +1114,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, |
328 |
/* |
329 |
* Attempt to initiate a splice from a file to a pipe. |
330 |
*/ |
331 |
@@ -41,6 +54,18 @@ |
332 |
{ |
333 |
ssize_t (*splice_read)(struct file *, loff_t *, |
334 |
struct pipe_inode_info *, size_t, unsigned int); |
335 |
+diff --git a/include/linux/fs.h b/include/linux/fs.h |
336 |
+index 17fd887..9c75a47 100644 |
337 |
+--- a/include/linux/fs.h |
338 |
++++ b/include/linux/fs.h |
339 |
+@@ -2591,6 +2591,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); |
340 |
+ extern int inode_newsize_ok(const struct inode *, loff_t offset); |
341 |
+ extern void setattr_copy(struct inode *inode, const struct iattr *attr); |
342 |
+ |
343 |
++extern int update_time(struct inode *, struct timespec *, int); |
344 |
+ extern int file_update_time(struct file *file); |
345 |
+ |
346 |
+ extern int generic_show_options(struct seq_file *m, struct dentry *root); |
347 |
diff --git a/include/linux/namei.h b/include/linux/namei.h |
348 |
index ffc0213..ef35a31 100644 |
349 |
--- a/include/linux/namei.h |