Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 10:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs/proc/task_mmu.c: cleanup the "tail_vma" horror in m_next()

Browse Source 
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>
This commit is contained in:
Oleg Nesterov 2014-10-09 15:25:30 -07:00 committed by Linus Torvalds
parent 59b4bf12d4
commit 23d54837e4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/proc/task_mmu.c
View File

@ -210,15 +210,13 @@ out:
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 *vma = v;
struct vm_area_struct *tail_vma = priv->tail_vma; 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 && (vma != tail_vma) && vma->vm_next) if (vma != tail_vma)
return vma->vm_next; next = vma->vm_next ?: tail_vma;
next = (vma != tail_vma) ? tail_vma : NULL;
if (!next) if (!next)
vma_stop(priv); vma_stop(priv);
return next; return next;