aufs4-standalone.patch 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383
  1. aufs4.4 standalone patch
  2. diff --git a/fs/dcache.c b/fs/dcache.c
  3. index 8aa7f26..ff9a6f3 100644
  4. --- a/fs/dcache.c
  5. +++ b/fs/dcache.c
  6. @@ -1272,6 +1272,7 @@ rename_retry:
  7. seq = 1;
  8. goto again;
  9. }
  10. +EXPORT_SYMBOL_GPL(d_walk);
  11. /*
  12. * Search for at least 1 mount point in the dentry's subdirs.
  13. diff --git a/fs/exec.c b/fs/exec.c
  14. index b06623a..3526d30 100644
  15. --- a/fs/exec.c
  16. +++ b/fs/exec.c
  17. @@ -103,6 +103,7 @@ bool path_noexec(const struct path *path)
  18. return (path->mnt->mnt_flags & MNT_NOEXEC) ||
  19. (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  20. }
  21. +EXPORT_SYMBOL_GPL(path_noexec);
  22. #ifdef CONFIG_USELIB
  23. /*
  24. diff --git a/fs/fcntl.c b/fs/fcntl.c
  25. index dacbf71..8abb9f81 100644
  26. --- a/fs/fcntl.c
  27. +++ b/fs/fcntl.c
  28. @@ -81,6 +81,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
  29. out:
  30. return error;
  31. }
  32. +EXPORT_SYMBOL_GPL(setfl);
  33. static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
  34. int force)
  35. diff --git a/fs/file_table.c b/fs/file_table.c
  36. index ad17e05..ae9f267 100644
  37. --- a/fs/file_table.c
  38. +++ b/fs/file_table.c
  39. @@ -147,6 +147,7 @@ over:
  40. }
  41. return ERR_PTR(-ENFILE);
  42. }
  43. +EXPORT_SYMBOL_GPL(get_empty_filp);
  44. /**
  45. * alloc_file - allocate and initialize a 'struct file'
  46. @@ -258,6 +259,7 @@ void flush_delayed_fput(void)
  47. {
  48. delayed_fput(NULL);
  49. }
  50. +EXPORT_SYMBOL_GPL(flush_delayed_fput);
  51. static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
  52. @@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
  53. }
  54. EXPORT_SYMBOL(fput);
  55. +EXPORT_SYMBOL_GPL(__fput_sync);
  56. void put_filp(struct file *file)
  57. {
  58. @@ -308,6 +311,7 @@ void put_filp(struct file *file)
  59. file_free(file);
  60. }
  61. }
  62. +EXPORT_SYMBOL_GPL(put_filp);
  63. void __init files_init(void)
  64. {
  65. diff --git a/fs/inode.c b/fs/inode.c
  66. index 05c423e..5d437a9 100644
  67. --- a/fs/inode.c
  68. +++ b/fs/inode.c
  69. @@ -1593,6 +1593,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
  70. return update_time(inode, time, flags);
  71. }
  72. +EXPORT_SYMBOL_GPL(update_time);
  73. /**
  74. * touch_atime - update the access time
  75. diff --git a/fs/namespace.c b/fs/namespace.c
  76. index 0570729..fc50028 100644
  77. --- a/fs/namespace.c
  78. +++ b/fs/namespace.c
  79. @@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
  80. mnt_dec_writers(real_mount(mnt));
  81. preempt_enable();
  82. }
  83. +EXPORT_SYMBOL_GPL(__mnt_drop_write);
  84. /**
  85. * mnt_drop_write - give up write access to a mount
  86. @@ -1803,6 +1804,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  87. }
  88. return 0;
  89. }
  90. +EXPORT_SYMBOL_GPL(iterate_mounts);
  91. static void cleanup_group_ids(struct mount *mnt, struct mount *end)
  92. {
  93. diff --git a/fs/notify/group.c b/fs/notify/group.c
  94. index d16b62c..53e45b6 100644
  95. --- a/fs/notify/group.c
  96. +++ b/fs/notify/group.c
  97. @@ -22,6 +22,7 @@
  98. #include <linux/srcu.h>
  99. #include <linux/rculist.h>
  100. #include <linux/wait.h>
  101. +#include <linux/module.h>
  102. #include <linux/fsnotify_backend.h>
  103. #include "fsnotify.h"
  104. @@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
  105. {
  106. atomic_inc(&group->refcnt);
  107. }
  108. +EXPORT_SYMBOL_GPL(fsnotify_get_group);
  109. /*
  110. * Drop a reference to a group. Free it if it's through.
  111. @@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
  112. if (atomic_dec_and_test(&group->refcnt))
  113. fsnotify_final_destroy_group(group);
  114. }
  115. +EXPORT_SYMBOL_GPL(fsnotify_put_group);
  116. /*
  117. * Create a new fsnotify_group and hold a reference for the group returned.
  118. @@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
  119. return group;
  120. }
  121. +EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
  122. int fsnotify_fasync(int fd, struct file *file, int on)
  123. {
  124. diff --git a/fs/notify/mark.c b/fs/notify/mark.c
  125. index fc0df44..8175f3c 100644
  126. --- a/fs/notify/mark.c
  127. +++ b/fs/notify/mark.c
  128. @@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
  129. mark->free_mark(mark);
  130. }
  131. }
  132. +EXPORT_SYMBOL_GPL(fsnotify_put_mark);
  133. /* Calculate mask of events for a list of marks */
  134. u32 fsnotify_recalc_mask(struct hlist_head *head)
  135. @@ -208,6 +209,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
  136. mutex_unlock(&group->mark_mutex);
  137. fsnotify_free_mark(mark);
  138. }
  139. +EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
  140. void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
  141. {
  142. @@ -392,6 +394,7 @@ err:
  143. return ret;
  144. }
  145. +EXPORT_SYMBOL_GPL(fsnotify_add_mark);
  146. int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
  147. struct inode *inode, struct vfsmount *mnt, int allow_dups)
  148. @@ -492,6 +495,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
  149. atomic_set(&mark->refcnt, 1);
  150. mark->free_mark = free_mark;
  151. }
  152. +EXPORT_SYMBOL_GPL(fsnotify_init_mark);
  153. static int fsnotify_mark_destroy(void *ignored)
  154. {
  155. diff --git a/fs/open.c b/fs/open.c
  156. index b6f1e96..e59c51b 100644
  157. --- a/fs/open.c
  158. +++ b/fs/open.c
  159. @@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
  160. mutex_unlock(&dentry->d_inode->i_mutex);
  161. return ret;
  162. }
  163. +EXPORT_SYMBOL_GPL(do_truncate);
  164. long vfs_truncate(struct path *path, loff_t length)
  165. {
  166. @@ -678,6 +679,7 @@ int open_check_o_direct(struct file *f)
  167. }
  168. return 0;
  169. }
  170. +EXPORT_SYMBOL_GPL(open_check_o_direct);
  171. static int do_dentry_open(struct file *f,
  172. struct inode *inode,
  173. diff --git a/fs/read_write.c b/fs/read_write.c
  174. index fd0414e..0a28933 100644
  175. --- a/fs/read_write.c
  176. +++ b/fs/read_write.c
  177. @@ -504,6 +504,7 @@ vfs_readf_t vfs_readf(struct file *file)
  178. return new_sync_read;
  179. return ERR_PTR(-ENOSYS);
  180. }
  181. +EXPORT_SYMBOL_GPL(vfs_readf);
  182. vfs_writef_t vfs_writef(struct file *file)
  183. {
  184. @@ -515,6 +516,7 @@ vfs_writef_t vfs_writef(struct file *file)
  185. return new_sync_write;
  186. return ERR_PTR(-ENOSYS);
  187. }
  188. +EXPORT_SYMBOL_GPL(vfs_writef);
  189. ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
  190. {
  191. diff --git a/fs/splice.c b/fs/splice.c
  192. index 30a091d..b0ade1f 100644
  193. --- a/fs/splice.c
  194. +++ b/fs/splice.c
  195. @@ -1123,6 +1123,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  196. return splice_write(pipe, out, ppos, len, flags);
  197. }
  198. +EXPORT_SYMBOL_GPL(do_splice_from);
  199. /*
  200. * Attempt to initiate a splice from a file to a pipe.
  201. @@ -1149,6 +1150,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  202. return splice_read(in, ppos, pipe, len, flags);
  203. }
  204. +EXPORT_SYMBOL_GPL(do_splice_to);
  205. /**
  206. * splice_direct_to_actor - splices data directly between two non-pipes
  207. diff --git a/fs/xattr.c b/fs/xattr.c
  208. index 9b932b9..0c317c4 100644
  209. --- a/fs/xattr.c
  210. +++ b/fs/xattr.c
  211. @@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
  212. *xattr_value = value;
  213. return error;
  214. }
  215. +EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);
  216. /* Compare an extended attribute value with the given value */
  217. int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
  218. diff --git a/kernel/task_work.c b/kernel/task_work.c
  219. index 53fa971..bce3211 100644
  220. --- a/kernel/task_work.c
  221. +++ b/kernel/task_work.c
  222. @@ -118,3 +118,4 @@ void task_work_run(void)
  223. } while (work);
  224. }
  225. }
  226. +EXPORT_SYMBOL_GPL(task_work_run);
  227. diff --git a/security/commoncap.c b/security/commoncap.c
  228. index 1832cf7..646e9b2 100644
  229. --- a/security/commoncap.c
  230. +++ b/security/commoncap.c
  231. @@ -1053,12 +1053,14 @@ int cap_mmap_addr(unsigned long addr)
  232. }
  233. return ret;
  234. }
  235. +EXPORT_SYMBOL_GPL(cap_mmap_addr);
  236. int cap_mmap_file(struct file *file, unsigned long reqprot,
  237. unsigned long prot, unsigned long flags)
  238. {
  239. return 0;
  240. }
  241. +EXPORT_SYMBOL_GPL(cap_mmap_file);
  242. #ifdef CONFIG_SECURITY
  243. diff --git a/security/device_cgroup.c b/security/device_cgroup.c
  244. index 03c1652..f88c84b 100644
  245. --- a/security/device_cgroup.c
  246. +++ b/security/device_cgroup.c
  247. @@ -7,6 +7,7 @@
  248. #include <linux/device_cgroup.h>
  249. #include <linux/cgroup.h>
  250. #include <linux/ctype.h>
  251. +#include <linux/export.h>
  252. #include <linux/list.h>
  253. #include <linux/uaccess.h>
  254. #include <linux/seq_file.h>
  255. @@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask)
  256. return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
  257. access);
  258. }
  259. +EXPORT_SYMBOL_GPL(__devcgroup_inode_permission);
  260. int devcgroup_inode_mknod(int mode, dev_t dev)
  261. {
  262. diff --git a/security/security.c b/security/security.c
  263. index 46f405c..bc8514e 100644
  264. --- a/security/security.c
  265. +++ b/security/security.c
  266. @@ -433,6 +433,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
  267. return 0;
  268. return call_int_hook(path_rmdir, 0, dir, dentry);
  269. }
  270. +EXPORT_SYMBOL_GPL(security_path_rmdir);
  271. int security_path_unlink(struct path *dir, struct dentry *dentry)
  272. {
  273. @@ -449,6 +450,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
  274. return 0;
  275. return call_int_hook(path_symlink, 0, dir, dentry, old_name);
  276. }
  277. +EXPORT_SYMBOL_GPL(security_path_symlink);
  278. int security_path_link(struct dentry *old_dentry, struct path *new_dir,
  279. struct dentry *new_dentry)
  280. @@ -457,6 +459,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
  281. return 0;
  282. return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
  283. }
  284. +EXPORT_SYMBOL_GPL(security_path_link);
  285. int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
  286. struct path *new_dir, struct dentry *new_dentry,
  287. @@ -484,6 +487,7 @@ int security_path_truncate(struct path *path)
  288. return 0;
  289. return call_int_hook(path_truncate, 0, path);
  290. }
  291. +EXPORT_SYMBOL_GPL(security_path_truncate);
  292. int security_path_chmod(struct path *path, umode_t mode)
  293. {
  294. @@ -491,6 +495,7 @@ int security_path_chmod(struct path *path, umode_t mode)
  295. return 0;
  296. return call_int_hook(path_chmod, 0, path, mode);
  297. }
  298. +EXPORT_SYMBOL_GPL(security_path_chmod);
  299. int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
  300. {
  301. @@ -498,6 +503,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
  302. return 0;
  303. return call_int_hook(path_chown, 0, path, uid, gid);
  304. }
  305. +EXPORT_SYMBOL_GPL(security_path_chown);
  306. int security_path_chroot(struct path *path)
  307. {
  308. @@ -583,6 +589,7 @@ int security_inode_readlink(struct dentry *dentry)
  309. return 0;
  310. return call_int_hook(inode_readlink, 0, dentry);
  311. }
  312. +EXPORT_SYMBOL_GPL(security_inode_readlink);
  313. int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
  314. bool rcu)
  315. @@ -598,6 +605,7 @@ int security_inode_permission(struct inode *inode, int mask)
  316. return 0;
  317. return call_int_hook(inode_permission, 0, inode, mask);
  318. }
  319. +EXPORT_SYMBOL_GPL(security_inode_permission);
  320. int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  321. {
  322. @@ -736,6 +744,7 @@ int security_file_permission(struct file *file, int mask)
  323. return fsnotify_perm(file, mask);
  324. }
  325. +EXPORT_SYMBOL_GPL(security_file_permission);
  326. int security_file_alloc(struct file *file)
  327. {
  328. @@ -795,6 +804,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
  329. return ret;
  330. return ima_file_mmap(file, prot);
  331. }
  332. +EXPORT_SYMBOL_GPL(security_mmap_file);
  333. int security_mmap_addr(unsigned long addr)
  334. {