Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7dcd999 authored by Cong Wang's avatar Cong Wang Committed by Linus Torvalds
Browse files

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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b409e578

fs/proc/base.c

+1 −6
Original line number Diff line number Diff line
@@ -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 @@ static int proc_pid_cmdline(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);

	if (mm && !IS_ERR(mm)) {

		unsigned int nwords = 0;

fs/proc/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

fs/proc/task_mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/proc/task_nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;