Changeset 26378


Ignore:
Timestamp:
2011-03-30T18:49:18+02:00 (7 years ago)
Author:
mb
Message:

shmem_set_file: Remove ima_counts_get()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.38/980-vm_exports.patch

    r26377 r26378  
    22=================================================================== 
    33--- linux-2.6.38.2.orig/mm/shmem.c      2011-03-27 20:37:20.000000000 +0200 
    4 +++ linux-2.6.38.2/mm/shmem.c   2011-03-30 18:23:12.296417197 +0200 
    5 @@ -30,6 +30,7 @@ 
    6  #include <linux/module.h> 
    7  #include <linux/percpu_counter.h> 
    8  #include <linux/swap.h> 
    9 +#include <linux/ima.h> 
    10   
    11  static struct vfsmount *shm_mnt; 
    12   
    13 @@ -2710,6 +2711,17 @@ out: 
     4+++ linux-2.6.38.2/mm/shmem.c   2011-03-30 18:44:41.068346925 +0200 
     5@@ -2710,6 +2710,16 @@ out: 
    146  
    157 /* common code */ 
     
    179+void shmem_set_file(struct vm_area_struct *vma, struct file *file) 
    1810+{ 
    19 +       ima_counts_get(file); 
    2011+       if (vma->vm_file) 
    2112+               fput(vma->vm_file); 
     
    2920  * shmem_file_setup - get an unlinked file living in tmpfs 
    3021  * @name: name for dentry (to be seen in /proc/<pid>/maps 
    31 @@ -2787,10 +2799,7 @@ int shmem_zero_setup(struct vm_area_stru 
     22@@ -2787,10 +2797,7 @@ int shmem_zero_setup(struct vm_area_stru 
    3223        if (IS_ERR(file)) 
    3324                return PTR_ERR(file); 
Note: See TracChangeset for help on using the changeset viewer.