proc: remove mm_for_maps()

mm_for_maps() is a simple wrapper for mm_access(), and the name is
misleading, so just remove it and use mm_access() directly.

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 4 insertions, 11 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index e2d234243269..cca635d252d4 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -199,11 +199,6 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
         return result;
 }
 
-struct mm_struct *mm_for_maps(struct task_struct *task)
-{
-        return mm_access(task, PTRACE_MODE_READ);
-}
-
 static int proc_pid_cmdline(struct task_struct *task, char * buffer)
 {
         int res = 0;
@@ -243,7 +238,7 @@ out:
 
 static int proc_pid_auxv(struct task_struct *task, char *buffer)
 {
-        struct mm_struct *mm = mm_for_maps(task);
+        struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
         int res = PTR_ERR(mm);
         if (mm && !IS_ERR(mm)) {
                 unsigned int nwords = 0;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 5f79bb8b4c60..a30643784db5 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -31,8 +31,6 @@ struct vmalloc_info {
         unsigned long   largest_chunk;
 };
 
-extern struct mm_struct *mm_for_maps(struct task_struct *);
-
 #ifdef CONFIG_MMU
 #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
 extern void get_vmalloc_info(struct vmalloc_info *vmi);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 7faaf2acc570..83ede6e3b5ec 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -125,7 +125,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
         if (!priv->task)
                 return ERR_PTR(-ESRCH);
 
-        mm = mm_for_maps(priv->task);
+        mm = mm_access(priv->task, PTRACE_MODE_READ);
         if (!mm || IS_ERR(mm))
                 return mm;
         down_read(&mm->mmap_sem);
@@ -919,7 +919,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
         if (!pm.buffer)
                 goto out_task;
 
-        mm = mm_for_maps(task);
+        mm = mm_access(task, PTRACE_MODE_READ);
         ret = PTR_ERR(mm);
         if (!mm || IS_ERR(mm))
                 goto out_free;
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 74fe164d1b23..1ccfa537f5f5 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
         if (!priv->task)
                 return ERR_PTR(-ESRCH);
 
-        mm = mm_for_maps(priv->task);
+        mm = mm_access(priv->task, PTRACE_MODE_READ);
         if (!mm || IS_ERR(mm)) {
                 put_task_struct(priv->task);
                 priv->task = NULL;