summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2020-04-06 20:09:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-07 10:43:42 -0700
commitfad955009c2ba49e2eac98926ad5cce48b777e7e (patch)
tree8a793498b4c27af64c7aa60f64014d2067eb15f1 /fs/proc
parentb829a0f0f2f2094c1e40637259c44b854e6ebe96 (diff)
downloadlinux-stable-fad955009c2ba49e2eac98926ad5cce48b777e7e.tar.gz
linux-stable-fad955009c2ba49e2eac98926ad5cce48b777e7e.tar.bz2
linux-stable-fad955009c2ba49e2eac98926ad5cce48b777e7e.zip
proc: inline m_next_vma into m_next
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>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/task_mmu.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 9419c6972fcd..8d382d4ec067 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -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;