qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-03 10:31:05 +02:00
Code

shmem_set_file: Remove ima_counts_get()

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26378 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2011-03-30 16:49:18 +00:00
parent 8e18f4c4a0
commit a2c0b00b00
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/linux/generic/patches-2.6.38/980-vm_exports.patch
View File

@ -1,22 +1,13 @@
Index: linux-2.6.38.2/mm/shmem.c Index: linux-2.6.38.2/mm/shmem.c
=================================================================== ===================================================================
--- linux-2.6.38.2.orig/mm/shmem.c 2011-03-27 20:37:20.000000000 +0200 --- linux-2.6.38.2.orig/mm/shmem.c 2011-03-27 20:37:20.000000000 +0200
+++ linux-2.6.38.2/mm/shmem.c 2011-03-30 18:23:12.296417197 +0200 +++ linux-2.6.38.2/mm/shmem.c 2011-03-30 18:44:41.068346925 +0200
@@ -30,6 +30,7 @@ @@ -2710,6 +2710,16 @@ out:
#include <linux/module.h>
#include <linux/percpu_counter.h>
#include <linux/swap.h>
+#include <linux/ima.h>
static struct vfsmount *shm_mnt;
@@ -2710,6 +2711,17 @@ out:
/* common code */ /* common code */
+void shmem_set_file(struct vm_area_struct *vma, struct file *file) +void shmem_set_file(struct vm_area_struct *vma, struct file *file)
+{ +{
+ ima_counts_get(file);
+ if (vma->vm_file) + if (vma->vm_file)
+ fput(vma->vm_file); + fput(vma->vm_file);
+ vma->vm_file = file; + vma->vm_file = file;
@ -28,7 +19,7 @@ Index: linux-2.6.38.2/mm/shmem.c
/** /**
* shmem_file_setup - get an unlinked file living in tmpfs * shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps * @name: name for dentry (to be seen in /proc/<pid>/maps
@@ -2787,10 +2799,7 @@ int shmem_zero_setup(struct vm_area_stru @@ -2787,10 +2797,7 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file)) if (IS_ERR(file))
return PTR_ERR(file); return PTR_ERR(file);