wok-6.x diff linux/stuff/aufs2-standalone.patch @ rev 12769
zlib: make it an arm package (noe cook/cooker handle packages by arch
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun May 13 01:20:22 2012 +0200 (2012-05-13) |
parents | 34e3298168a8 |
children |
line diff
1.1 --- a/linux/stuff/aufs2-standalone.patch Mon Feb 21 04:39:34 2011 +0100 1.2 +++ b/linux/stuff/aufs2-standalone.patch Sun May 13 01:20:22 2012 +0200 1.3 @@ -1,10 +1,10 @@ 1.4 -aufs2.1 standalone patch for linux-2.6.37 1.5 +aufs2.1 standalone patch for linux-2.6. 1.6 1.7 diff --git a/fs/file_table.c b/fs/file_table.c 1.8 -index c3dee38..f529e4d 100644 1.9 +index 01e4c1e..0e800e2 100644 1.10 --- a/fs/file_table.c 1.11 +++ b/fs/file_table.c 1.12 -@@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file) 1.13 +@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) 1.14 } 1.15 } 1.16 1.17 @@ -14,22 +14,22 @@ 1.18 1.19 /* 1.20 diff --git a/fs/inode.c b/fs/inode.c 1.21 -index ae2727a..2c8071a 100644 1.22 +index 43566d1..4291eae 100644 1.23 --- a/fs/inode.c 1.24 +++ b/fs/inode.c 1.25 -@@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly; 1.26 - * the i_state of an inode while it is in use.. 1.27 - */ 1.28 - DEFINE_SPINLOCK(inode_lock); 1.29 -+EXPORT_SYMBOL(inode_lock); 1.30 +@@ -69,6 +69,7 @@ static DEFINE_SPINLOCK(inode_lru_lock); 1.31 + 1.32 + __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); 1.33 + __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock); 1.34 ++EXPORT_SYMBOL(inode_sb_list_lock); 1.35 1.36 /* 1.37 - * iprune_sem provides exclusion between the kswapd or try_to_free_pages 1.38 + * iprune_sem provides exclusion between the icache shrinking and the 1.39 diff --git a/fs/namei.c b/fs/namei.c 1.40 -index a8c583f..b020c45 100644 1.41 +index 95978ec..f86d670 100644 1.42 --- a/fs/namei.c 1.43 +++ b/fs/namei.c 1.44 -@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) 1.45 +@@ -365,6 +365,7 @@ int deny_write_access(struct file * file) 1.46 1.47 return 0; 1.48 } 1.49 @@ -37,27 +37,19 @@ 1.50 1.51 /** 1.52 * path_get - get a reference to a path 1.53 -@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd) 1.54 +@@ -1696,6 +1697,7 @@ struct dentry *lookup_hash(struct nameidata *nd) 1.55 { 1.56 return __lookup_hash(&nd->last, nd->path.dentry, nd); 1.57 } 1.58 +EXPORT_SYMBOL(lookup_hash); 1.59 1.60 - int __lookup_one_len(const char *name, struct qstr *this, 1.61 - struct dentry *base, int len) 1.62 -@@ -1187,6 +1189,7 @@ int __lookup_one_len(const char *name, struct qstr *this, 1.63 - this->hash = end_name_hash(hash); 1.64 - return 0; 1.65 - } 1.66 -+EXPORT_SYMBOL(__lookup_one_len); 1.67 - 1.68 /** 1.69 * lookup_one_len - filesystem helper to lookup single pathname component 1.70 diff --git a/fs/namespace.c b/fs/namespace.c 1.71 -index 3dbfc07..3998762 100644 1.72 +index fe59bd1..7d3843f 100644 1.73 --- a/fs/namespace.c 1.74 +++ b/fs/namespace.c 1.75 -@@ -1321,6 +1321,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, 1.76 +@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, 1.77 } 1.78 return 0; 1.79 } 1.80 @@ -91,10 +83,10 @@ 1.81 } 1.82 +EXPORT_SYMBOL(fsnotify_alloc_group); 1.83 diff --git a/fs/notify/mark.c b/fs/notify/mark.c 1.84 -index 325185e..adede09 100644 1.85 +index 252ab1f..2199b9b 100644 1.86 --- a/fs/notify/mark.c 1.87 +++ b/fs/notify/mark.c 1.88 -@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) 1.89 +@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) 1.90 if (atomic_dec_and_test(&mark->refcnt)) 1.91 mark->free_mark(mark); 1.92 } 1.93 @@ -102,7 +94,7 @@ 1.94 1.95 /* 1.96 * Any time a mark is getting freed we end up here. 1.97 -@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) 1.98 +@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) 1.99 if (unlikely(atomic_dec_and_test(&group->num_marks))) 1.100 fsnotify_final_destroy_group(group); 1.101 } 1.102 @@ -110,7 +102,7 @@ 1.103 1.104 void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) 1.105 { 1.106 -@@ -277,6 +279,7 @@ err: 1.107 +@@ -276,6 +278,7 @@ err: 1.108 1.109 return ret; 1.110 } 1.111 @@ -118,7 +110,7 @@ 1.112 1.113 /* 1.114 * clear any marks in a group in which mark->flags & flags is true 1.115 -@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, 1.116 +@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, 1.117 atomic_set(&mark->refcnt, 1); 1.118 mark->free_mark = free_mark; 1.119 } 1.120 @@ -127,7 +119,7 @@ 1.121 static int fsnotify_mark_destroy(void *ignored) 1.122 { 1.123 diff --git a/fs/open.c b/fs/open.c 1.124 -index 4197b9e..912817a 100644 1.125 +index b52cf01..c1b341c 100644 1.126 --- a/fs/open.c 1.127 +++ b/fs/open.c 1.128 @@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, 1.129 @@ -139,10 +131,10 @@ 1.130 static long do_sys_truncate(const char __user *pathname, loff_t length) 1.131 { 1.132 diff --git a/fs/splice.c b/fs/splice.c 1.133 -index ff0ae69..1c9e9b0 100644 1.134 +index 19afec6..11f07f8 100644 1.135 --- a/fs/splice.c 1.136 +++ b/fs/splice.c 1.137 -@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 1.138 +@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, 1.139 1.140 return splice_write(pipe, out, ppos, len, flags); 1.141 } 1.142 @@ -150,7 +142,7 @@ 1.143 1.144 /* 1.145 * Attempt to initiate a splice from a file to a pipe. 1.146 -@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos, 1.147 +@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, 1.148 1.149 return splice_read(in, ppos, pipe, len, flags); 1.150 } 1.151 @@ -159,39 +151,31 @@ 1.152 /** 1.153 * splice_direct_to_actor - splices data directly between two non-pipes 1.154 diff --git a/security/commoncap.c b/security/commoncap.c 1.155 -index 64c2ed9..e58b5d8 100644 1.156 +index a93b3b7..024282c 100644 1.157 --- a/security/commoncap.c 1.158 +++ b/security/commoncap.c 1.159 -@@ -929,3 +929,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, 1.160 +@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, 1.161 } 1.162 return ret; 1.163 } 1.164 +EXPORT_SYMBOL(cap_file_mmap); 1.165 diff --git a/security/device_cgroup.c b/security/device_cgroup.c 1.166 -index 8d9c48f..29108aa 100644 1.167 +index 1be6826..215278c 100644 1.168 --- a/security/device_cgroup.c 1.169 +++ b/security/device_cgroup.c 1.170 -@@ -515,6 +515,7 @@ found: 1.171 +@@ -508,6 +508,7 @@ found: 1.172 1.173 return -EPERM; 1.174 } 1.175 -+EXPORT_SYMBOL(devcgroup_inode_permission); 1.176 ++EXPORT_SYMBOL(__devcgroup_inode_permission); 1.177 1.178 int devcgroup_inode_mknod(int mode, dev_t dev) 1.179 { 1.180 diff --git a/security/security.c b/security/security.c 1.181 -index 1b798d3..3b7d2ca 100644 1.182 +index 4ba6d4c..9f64bb8 100644 1.183 --- a/security/security.c 1.184 +++ b/security/security.c 1.185 -@@ -360,6 +360,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) 1.186 - return 0; 1.187 - return security_ops->path_mkdir(dir, dentry, mode); 1.188 - } 1.189 -+EXPORT_SYMBOL(security_path_mkdir); 1.190 - 1.191 - int security_path_rmdir(struct path *dir, struct dentry *dentry) 1.192 - { 1.193 -@@ -367,6 +368,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) 1.194 +@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) 1.195 return 0; 1.196 return security_ops->path_rmdir(dir, dentry); 1.197 } 1.198 @@ -199,15 +183,7 @@ 1.199 1.200 int security_path_unlink(struct path *dir, struct dentry *dentry) 1.201 { 1.202 -@@ -374,6 +376,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) 1.203 - return 0; 1.204 - return security_ops->path_unlink(dir, dentry); 1.205 - } 1.206 -+EXPORT_SYMBOL(security_path_unlink); 1.207 - 1.208 - int security_path_symlink(struct path *dir, struct dentry *dentry, 1.209 - const char *old_name) 1.210 -@@ -382,6 +385,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, 1.211 +@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, 1.212 return 0; 1.213 return security_ops->path_symlink(dir, dentry, old_name); 1.214 } 1.215 @@ -215,7 +191,7 @@ 1.216 1.217 int security_path_link(struct dentry *old_dentry, struct path *new_dir, 1.218 struct dentry *new_dentry) 1.219 -@@ -390,6 +394,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, 1.220 +@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, 1.221 return 0; 1.222 return security_ops->path_link(old_dentry, new_dir, new_dentry); 1.223 } 1.224 @@ -223,15 +199,7 @@ 1.225 1.226 int security_path_rename(struct path *old_dir, struct dentry *old_dentry, 1.227 struct path *new_dir, struct dentry *new_dentry) 1.228 -@@ -400,6 +405,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, 1.229 - return security_ops->path_rename(old_dir, old_dentry, new_dir, 1.230 - new_dentry); 1.231 - } 1.232 -+EXPORT_SYMBOL(security_path_rename); 1.233 - 1.234 - int security_path_truncate(struct path *path) 1.235 - { 1.236 -@@ -407,6 +413,7 @@ int security_path_truncate(struct path *path) 1.237 +@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) 1.238 return 0; 1.239 return security_ops->path_truncate(path); 1.240 } 1.241 @@ -239,7 +207,7 @@ 1.242 1.243 int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 1.244 mode_t mode) 1.245 -@@ -415,6 +422,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 1.246 +@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 1.247 return 0; 1.248 return security_ops->path_chmod(dentry, mnt, mode); 1.249 } 1.250 @@ -247,7 +215,7 @@ 1.251 1.252 int security_path_chown(struct path *path, uid_t uid, gid_t gid) 1.253 { 1.254 -@@ -422,6 +430,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) 1.255 +@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) 1.256 return 0; 1.257 return security_ops->path_chown(path, uid, gid); 1.258 } 1.259 @@ -255,7 +223,7 @@ 1.260 1.261 int security_path_chroot(struct path *path) 1.262 { 1.263 -@@ -498,6 +507,7 @@ int security_inode_readlink(struct dentry *dentry) 1.264 +@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) 1.265 return 0; 1.266 return security_ops->inode_readlink(dentry); 1.267 } 1.268 @@ -263,15 +231,15 @@ 1.269 1.270 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) 1.271 { 1.272 -@@ -512,6 +522,7 @@ int security_inode_permission(struct inode *inode, int mask) 1.273 +@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) 1.274 return 0; 1.275 - return security_ops->inode_permission(inode, mask); 1.276 + return security_ops->inode_permission(inode, mask, 0); 1.277 } 1.278 +EXPORT_SYMBOL(security_inode_permission); 1.279 1.280 - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) 1.281 + int security_inode_exec_permission(struct inode *inode, unsigned int flags) 1.282 { 1.283 -@@ -611,6 +622,7 @@ int security_file_permission(struct file *file, int mask) 1.284 +@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask) 1.285 1.286 return fsnotify_perm(file, mask); 1.287 } 1.288 @@ -279,7 +247,7 @@ 1.289 1.290 int security_file_alloc(struct file *file) 1.291 { 1.292 -@@ -638,6 +650,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, 1.293 +@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, 1.294 return ret; 1.295 return ima_file_mmap(file, prot); 1.296 }