aboutsummaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorOleg Nesterov2014-10-09 15:25:30 -0700
committerLinus Torvalds2014-10-09 22:25:48 -0400
commit23d54837e4f3a44ad4514d5eae8245c2250217ff (patch)
tree086ff9b97bd790748e9da7798d6714cd8fca06f6 /fs/proc
parent59b4bf12d4776c0e4f3fd5c02d942f3a0596da97 (diff)
fs/proc/task_mmu.c: cleanup the "tail_vma" horror in m_next()
1. Kill the first "vma != NULL" check. Firstly this is not possible, m_next() won't be called if ->start() or the previous ->next() returns NULL. And if it was possible the 2nd "vma != tail_vma" check is buggy, we should not wrongly return ->tail_vma. 2. Make this function readable. The logic is very simple, we should return check "vma != tail" once and return "vm_next || tail_vma". Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: 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')
-rw-r--r--fs/proc/task_mmu.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index fdbed8370db6..b7e31836a005 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -210,15 +210,13 @@ out:
static void *m_next(struct seq_file *m, void *v, loff_t *pos)
{
struct proc_maps_private *priv = m->private;
- struct vm_area_struct *vma = v;
struct vm_area_struct *tail_vma = priv->tail_vma;
- struct vm_area_struct *next;
+ struct vm_area_struct *vma = v, *next = NULL;
(*pos)++;
- if (vma && (vma != tail_vma) && vma->vm_next)
- return vma->vm_next;
+ if (vma != tail_vma)
+ next = vma->vm_next ?: tail_vma;
- next = (vma != tail_vma) ? tail_vma : NULL;
if (!next)
vma_stop(priv);
return next;