From 2c03376d2db005869b1d4449097d51c96196529e Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Thu, 9 Oct 2014 15:25:51 -0700 Subject: 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: Oleg Nesterov Cc: Alexander Viro Cc: Cyrill Gorcunov Cc: "Eric W. Biederman" Cc: Greg Ungerer Cc: "Kirill A. Shutemov" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/proc/internal.h | 2 +- fs/proc/task_mmu.c | 4 ++-- fs/proc/task_nommu.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/proc/internal.h b/fs/proc/internal.h index d27182854a28..aa7a0ee182e1 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -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 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 34d93a1cdeec..4793e4a843b0 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -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); diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index 429cb7a5419e..f36e213835cc 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -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); -- cgit v1.2.3