summaryrefslogtreecommitdiffstats
path: root/fs/proc/task_mmu.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2014-10-10 00:25:39 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-10 04:25:49 +0200
commitad2a00e4b7e20ab03700b0bb13270b6cee45c6e0 (patch)
tree4483971e6ae6042a5060a9a360930fbbfc83b65c /fs/proc/task_mmu.c
parentfs/proc/task_mmu.c: simplify m_start() to make it readable (diff)
downloadlinux-ad2a00e4b7e20ab03700b0bb13270b6cee45c6e0.tar.xz
linux-ad2a00e4b7e20ab03700b0bb13270b6cee45c6e0.zip
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: Oleg 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc/task_mmu.c')
-rw-r--r--fs/proc/task_mmu.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index bb16c967eefd..fef398948462 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -138,6 +138,14 @@ static void vma_stop(struct proc_maps_private *priv)
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)
{
struct proc_maps_private *priv = m->private;
@@ -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)
{
struct proc_maps_private *priv = m->private;
- struct vm_area_struct *tail_vma = priv->tail_vma;
- struct vm_area_struct *vma = v, *next = NULL;
+ struct vm_area_struct *next;
(*pos)++;
- if (vma != tail_vma)
- next = vma->vm_next ?: tail_vma;
-
+ next = m_next_vma(priv, v);
if (!next)
vma_stop(priv);
return next;