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 <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Cyrill Gorcunov <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>
Cc: Greg Ungerer <[email protected]>
Cc: "Kirill A. Shutemov" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index d27182854a287d82daf7f103809995698c47bf43..aa7a0ee182e19329636b21f079fac074145aaa84 100644 (file)
--- 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 34d93a1cdeec7409a3f01c35885cb86c8f69a52a..4793e4a843b06fcda0ab31e6ae8e7a6469af6a93 100644 (file)
--- 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 429cb7a5419ec6e7491b17f0fdc4ad69fb34d9da..f36e213835cc782a2b6a6a744eeaece4c55a5bfd 100644 (file)
--- 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);