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

Commit 2c03376d authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

proc/maps: replace proc_maps_private->pid with "struct inode *inode" 



m_start() can use get_proc_task() instead, and "struct inode *"
provides more potentially useful info, see the next changes.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 47fecca1

fs/proc/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ extern int proc_remount(struct super_block *, int *, char *); 
 * task_[no]mmu.c

 */

struct proc_maps_private {

	struct pid *pid;

	struct inode *inode;

	struct task_struct *task;

	struct mm_struct *mm;

#ifdef CONFIG_MMU

fs/proc/task_mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos) 
	if (last_addr == -1UL)

		return NULL;



	priv->task = get_pid_task(priv->pid, PIDTYPE_PID);

	priv->task = get_proc_task(priv->inode);

	if (!priv->task)

		return ERR_PTR(-ESRCH);
@@ -231,7 +231,7 @@ static int proc_maps_open(struct inode *inode, struct file *file, 
	if (!priv)

		return -ENOMEM;



	priv->pid = proc_pid(inode);

	priv->inode = inode;

	priv->mm = proc_mem_open(inode, PTRACE_MODE_READ);

	if (IS_ERR(priv->mm)) {

		int err = PTR_ERR(priv->mm);

fs/proc/task_nommu.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void *m_start(struct seq_file *m, loff_t *pos) 
	loff_t n = *pos;



	/* pin the task and mm whilst we play with them */

	priv->task = get_pid_task(priv->pid, PIDTYPE_PID);

	priv->task = get_proc_task(priv->inode);

	if (!priv->task)

		return ERR_PTR(-ESRCH);
@@ -276,7 +276,7 @@ static int maps_open(struct inode *inode, struct file *file, 
	if (!priv)

		return -ENOMEM;



	priv->pid = proc_pid(inode);

	priv->inode = inode;

	priv->mm = proc_mem_open(inode, PTRACE_MODE_READ);

	if (IS_ERR(priv->mm)) {

		int err = PTR_ERR(priv->mm);