This puts all the clear_refs code where it belongs and probably lets things

compile on MMU-less systems as well.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/base.c          |   36 -------------------------------
 fs/proc/internal.h      |    6 -----
 fs/proc/task_mmu.c      |   44 +++++++++++++++++++++++++++++++-------
 include/linux/proc_fs.h |    1
 4 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 23a09ba794a45234018db13b6d11f209a7cd7ba8..983edb76a786cae1e966cef0b7cd5e905e82da3b 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -45,11 +45,6 @@ extern struct file_operations proc_numa_maps_operations;
 extern struct file_operations proc_smaps_operations;
 extern struct file_operations proc_clear_refs_operations;
 
-extern struct file_operations proc_maps_operations;
-extern struct file_operations proc_numa_maps_operations;
-extern struct file_operations proc_smaps_operations;
-
-
 void free_proc_entry(struct proc_dir_entry *de);
 
 int proc_init_inodecache(void);

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 0216cdd26fc69e497a56822e0f843ff6f757372b..a4826c1bf4c374630a14096e0d7455dc99f24c14 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -321,19 +321,46 @@ static int show_smap(struct seq_file *m, void *v)
 
 static struct mm_walk clear_refs_walk = { .pmd_entry = clear_refs_pte_range };
 
-void clear_refs_smap(struct mm_struct *mm)
+static ssize_t clear_refs_write(struct file *file, const char __user *buf,
+                               size_t count, loff_t *ppos)
 {
+       struct task_struct *task;
+       char buffer[13], *end;
+       struct mm_struct *mm;
        struct vm_area_struct *vma;
 
-       down_read(&mm->mmap_sem);
-       for (vma = mm->mmap; vma; vma = vma->vm_next)
-               if (vma->vm_mm && !is_vm_hugetlb_page(vma))
-                       walk_page_range(vma->vm_mm, vma->vm_start, vma->vm_end,
-                                       &clear_refs_walk, vma);
-       flush_tlb_mm(mm);
-       up_read(&mm->mmap_sem);
+       memset(buffer, 0, sizeof(buffer));
+       if (count > sizeof(buffer) - 1)
+               count = sizeof(buffer) - 1;
+       if (copy_from_user(buffer, buf, count))
+               return -EFAULT;
+       if (!simple_strtol(buffer, &end, 0))
+               return -EINVAL;
+       if (*end == '\n')
+               end++;
+       task = get_proc_task(file->f_dentry->d_inode);
+       if (!task)
+               return -ESRCH;
+       mm = mm_for_maps(task);
+       if (mm) {
+               for (vma = mm->mmap; vma; vma = vma->vm_next)
+                       if (!is_vm_hugetlb_page(vma))
+                               walk_page_range(mm, vma->vm_start, vma->vm_end,
+                                               &clear_refs_walk, vma);
+               flush_tlb_mm(mm);
+               up_read(&mm->mmap_sem);
+               mmput(mm);
+       }
+       put_task_struct(task);
+       if (end - buffer == 0)
+               return -EIO;
+       return end - buffer;
 }
 
+struct file_operations proc_clear_refs_operations = {
+       .write          = clear_refs_write,
+};
+
 static void *m_start(struct seq_file *m, loff_t *pos)
 {
        struct proc_maps_private *priv = m->private;