Commit fad95500 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

proc: inline m_next_vma into m_next 



It's clearer to just put this inline.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200317193201.9924-5-adobriyan@gmail.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b829a0f0

fs/proc/task_mmu.c

+8 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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;