Skip to content

Commit

Permalink
proc: use ppos instead of m->version
Browse files Browse the repository at this point in the history
The ppos is a private cursor, just like m->version.  Use the canonical
cursor, not a special one.

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-3-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 c2e88d2 commit 4781f2c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions fs/proc/task_mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ m_next_vma(struct proc_maps_private *priv, struct vm_area_struct *vma)
static void *m_start(struct seq_file *m, loff_t *ppos)
{
struct proc_maps_private *priv = m->private;
unsigned long last_addr = m->version;
unsigned long last_addr = *ppos;
struct mm_struct *mm;
struct vm_area_struct *vma;

Expand Down Expand Up @@ -170,14 +170,13 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
return priv->tail_vma;
}

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 *ppos)
{
struct proc_maps_private *priv = m->private;
struct vm_area_struct *next;

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

return next;
}
Expand Down

0 comments on commit 4781f2c

Please sign in to comment.