Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

proc: remove mm_for_maps()

Browse Source 
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>
This commit is contained in:
Cong Wang 2012-05-31 16:26:17 -07:00 committed by Linus Torvalds
parent b409e578d9
commit e7dcd9990e
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/proc/base.c
View File

@ -199,11 +199,6 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
return result; 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) static int proc_pid_cmdline(struct task_struct *task, char * buffer)
{ {
int res = 0; int res = 0;
@ -243,7 +238,7 @@ out:
static int proc_pid_auxv(struct task_struct *task, char *buffer) 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); int res = PTR_ERR(mm);
if (mm && !IS_ERR(mm)) { if (mm && !IS_ERR(mm)) {
unsigned int nwords = 0; unsigned int nwords = 0;

2
fs/proc/internal.h
View File

@ -31,8 +31,6 @@ struct vmalloc_info {
unsigned long largest_chunk; unsigned long largest_chunk;
}; };
extern struct mm_struct *mm_for_maps(struct task_struct *);
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START) #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
extern void get_vmalloc_info(struct vmalloc_info *vmi); extern void get_vmalloc_info(struct vmalloc_info *vmi);

4
fs/proc/task_mmu.c
View File

@ -125,7 +125,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
if (!priv->task) if (!priv->task)
return ERR_PTR(-ESRCH); return ERR_PTR(-ESRCH);
mm = mm_for_maps(priv->task); mm = mm_access(priv->task, PTRACE_MODE_READ);
if (!mm || IS_ERR(mm)) if (!mm || IS_ERR(mm))
return mm; return mm;
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
@ -919,7 +919,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
if (!pm.buffer) if (!pm.buffer)
goto out_task; goto out_task;
mm = mm_for_maps(task); mm = mm_access(task, PTRACE_MODE_READ);
ret = PTR_ERR(mm); ret = PTR_ERR(mm);
if (!mm || IS_ERR(mm)) if (!mm || IS_ERR(mm))
goto out_free; goto out_free;

2
fs/proc/task_nommu.c
View File

@ -223,7 +223,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
if (!priv->task) if (!priv->task)
return ERR_PTR(-ESRCH); return ERR_PTR(-ESRCH);
mm = mm_for_maps(priv->task); mm = mm_access(priv->task, PTRACE_MODE_READ);
if (!mm || IS_ERR(mm)) { if (!mm || IS_ERR(mm)) {
put_task_struct(priv->task); put_task_struct(priv->task);
priv->task = NULL; priv->task = NULL;