diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2010-03-16 20:12:06 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2010-03-16 20:12:06 +0000 |
| commit | 2fd0e3b30b59e5b1eb37c8bab1c2228642a50082 (patch) | |
| tree | ddee38f16f24cae428faf842c8e974e27ba548fd /sys-fs/aufs2/files | |
| parent | Remove inactive pgsql mirror (diff) | |
| download | historical-2fd0e3b30b59e5b1eb37c8bab1c2228642a50082.tar.gz historical-2fd0e3b30b59e5b1eb37c8bab1c2228642a50082.tar.bz2 historical-2fd0e3b30b59e5b1eb37c8bab1c2228642a50082.zip | |
Bump patch for kernel 2.6.31
Package-Manager: portage-2.2_rc67-r2/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/aufs2/files')
| -rw-r--r-- | sys-fs/aufs2/files/aufs2-standalone-31.patch | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/sys-fs/aufs2/files/aufs2-standalone-31.patch b/sys-fs/aufs2/files/aufs2-standalone-31.patch index 946177513b1b..d9b492284011 100644 --- a/sys-fs/aufs2/files/aufs2-standalone-31.patch +++ b/sys-fs/aufs2/files/aufs2-standalone-31.patch @@ -1,7 +1,7 @@ -aufs2 standalone patch for linux-2.6. +aufs2 standalone patch for linux-2.6.31 diff --git a/fs/namei.c b/fs/namei.c -index dcedad1..728a39b 100644 +index b49c2af..4521c70 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -337,6 +337,7 @@ int deny_write_access(struct file * file) @@ -72,6 +72,15 @@ index 0cb8873..0e7b0b9 100644 /** * splice_direct_to_actor - splices data directly between two non-pipes +diff --git a/security/commoncap.c b/security/commoncap.c +index e3097c0..96f9a66 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -1014,3 +1014,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, + } + return ret; + } ++EXPORT_SYMBOL(cap_file_mmap); diff --git a/security/device_cgroup.c b/security/device_cgroup.c index b8186ba..42208d8 100644 --- a/security/device_cgroup.c @@ -85,10 +94,10 @@ index b8186ba..42208d8 100644 int devcgroup_inode_mknod(int mode, dev_t dev) { diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c -index 4732f5e..6fa13dd 100644 +index b85e61b..a23fad4 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c -@@ -320,6 +320,7 @@ int ima_file_mmap(struct file *file, unsigned long prot) +@@ -324,6 +324,7 @@ int ima_file_mmap(struct file *file, unsigned long prot) MAY_EXEC, FILE_MMAP); return 0; } @@ -97,7 +106,7 @@ index 4732f5e..6fa13dd 100644 /** * ima_bprm_check - based on policy, collect/store measurement. diff --git a/security/security.c b/security/security.c -index dc7674f..b309f88 100644 +index dc7674f..5356129 100644 --- a/security/security.c +++ b/security/security.c @@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode) @@ -180,3 +189,11 @@ index dc7674f..b309f88 100644 int security_file_alloc(struct file *file) { +@@ -641,6 +651,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, + { + return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only); + } ++EXPORT_SYMBOL(security_file_mmap); + + int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, + unsigned long prot) |