From: Matthew Wilcox <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] proc: Inline m_next_vma into m_next
Date: Sat, 29 Feb 2020 08:59:10 -0800 [thread overview]
Message-ID: <20200229165910.24605-6-willy@infradead.org> (raw)
In-Reply-To: <20200229165910.24605-1-willy@infradead.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
It's clearer to just put this inline.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/proc/task_mmu.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 9f10ef72b839..87641df8c0d0 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;
--
2.25.0
next prev parent reply other threads:[~2020-02-29 16:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 16:59 [PATCH 0/5] Simplify /proc/$pid/maps implementation Matthew Wilcox
2020-02-29 16:59 ` [PATCH 1/5] proc: Inline vma_stop into m_stop Matthew Wilcox
2020-02-29 16:59 ` [PATCH 2/5] proc: remove m_cache_vma Matthew Wilcox
2020-02-29 16:59 ` [PATCH 3/5] proc: Use ppos instead of m->version Matthew Wilcox
2020-03-03 19:55 ` Alexey Dobriyan
2020-03-03 20:29 ` Matthew Wilcox
2020-03-03 20:53 ` Alexey Dobriyan
2020-03-03 21:05 ` Matthew Wilcox
2020-02-29 16:59 ` [PATCH 4/5] seq_file: Remove m->version Matthew Wilcox
2020-02-29 16:59 ` Matthew Wilcox [this message]
2020-03-03 8:34 ` [PATCH 0/5] Simplify /proc/$pid/maps implementation Vlastimil Babka
2020-03-03 19:56 ` Alexey Dobriyan
2020-03-03 20:31 ` Matthew Wilcox
-- strict thread matches above, loose matches on Subject: below --
2020-03-17 19:31 [PATCH 1/5] proc: inline vma_stop into m_stop Alexey Dobriyan
2020-03-17 19:32 ` [PATCH 5/5] proc: inline m_next_vma into m_next Alexey Dobriyan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200229165910.24605-6-willy@infradead.org \
--to=willy@infradead.org \
--cc=adobriyan@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).