Commit ad2a00e4 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

fs/proc/task_mmu.c: introduce m_next_vma() helper

Extract the tail_vma/vm_next calculation from m_next() into the new
trivial helper, m_next_vma().
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0c255321
...@@ -138,6 +138,14 @@ static void vma_stop(struct proc_maps_private *priv) ...@@ -138,6 +138,14 @@ static void vma_stop(struct proc_maps_private *priv)
mmput(mm); mmput(mm);
} }
static struct vm_area_struct *
m_next_vma(struct proc_maps_private *priv, struct vm_area_struct *vma)
{
if (vma == priv->tail_vma)
return NULL;
return vma->vm_next ?: priv->tail_vma;
}
static void *m_start(struct seq_file *m, loff_t *ppos) static void *m_start(struct seq_file *m, loff_t *ppos)
{ {
struct proc_maps_private *priv = m->private; struct proc_maps_private *priv = m->private;
...@@ -173,13 +181,10 @@ static void *m_start(struct seq_file *m, loff_t *ppos) ...@@ -173,13 +181,10 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
static void *m_next(struct seq_file *m, void *v, loff_t *pos) static void *m_next(struct seq_file *m, void *v, loff_t *pos)
{ {
struct proc_maps_private *priv = m->private; struct proc_maps_private *priv = m->private;
struct vm_area_struct *tail_vma = priv->tail_vma; struct vm_area_struct *next;
struct vm_area_struct *vma = v, *next = NULL;
(*pos)++; (*pos)++;
if (vma != tail_vma) next = m_next_vma(priv, v);
next = vma->vm_next ?: tail_vma;
if (!next) if (!next)
vma_stop(priv); vma_stop(priv);
return next; return next;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment