Skip to content

Commit

Permalink
proc: inline m_next_vma into m_next
Browse files Browse the repository at this point in the history
It's clearer to just put this inline.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200317193201.9924-5-adobriyan@gmail.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Matthew Wilcox (Oracle) authored and Linus Torvalds committed Apr 7, 2020
1 parent b829a0f commit fad9550
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions fs/proc/task_mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,6 @@ static void release_task_mempolicy(struct proc_maps_private *priv)
}
#endif

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;
Expand Down Expand Up @@ -173,9 +165,15 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
static void *m_next(struct seq_file *m, void *v, loff_t *ppos)
{
struct proc_maps_private *priv = m->private;
struct vm_area_struct *next;
struct vm_area_struct *next, *vma = v;

if (vma == priv->tail_vma)
next = NULL;
else if (vma->vm_next)
next = vma->vm_next;
else
next = priv->tail_vma;

next = m_next_vma(priv, v);
*ppos = next ? next->vm_start : -1UL;

return next;
Expand Down

0 comments on commit fad9550

Please sign in to comment.