From: Vlastimil Babka <vbabka@suse.cz>
To: linux-mm@kvack.org, "Liam R. Howlett" <Liam.Howlett@oracle.com>
Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev,
maple-tree@lists.infradead.org, Vlastimil Babka <vbabka@suse.cz>
Subject: [RFC 06/11] mm/mmap/vma_merge: initialize mid and next in natural order
Date: Fri, 24 Feb 2023 11:00:17 +0100 [thread overview]
Message-ID: <20230224100022.11268-7-vbabka@suse.cz> (raw)
In-Reply-To: <20230224100022.11268-1-vbabka@suse.cz>
It is more intuitive to go from prev to mid and then next. No functional
change.
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
---
mm/mmap.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c
index 1e4be7174964..e7d497237f44 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -912,10 +912,11 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
if (vm_flags & VM_SPECIAL)
return NULL;
- next = find_vma(mm, prev ? prev->vm_end : 0);
- mid = next;
- if (next && next->vm_end == end) /* cases 6, 7, 8 */
- next = find_vma(mm, next->vm_end);
+ mid = find_vma(mm, prev ? prev->vm_end : 0);
+ if (mid && mid->vm_end == end) /* cases 6, 7, 8 */
+ next = find_vma(mm, mid->vm_end);
+ else
+ next = mid;
/* verify some invariant that must be enforced by the caller */
VM_WARN_ON(prev && addr <= prev->vm_start);
--
2.39.2
next prev parent reply other threads:[~2023-02-24 10:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 10:00 [RFC 00/11] cleanup vma_merge and improve mergeability tests Vlastimil Babka
2023-02-24 10:00 ` [RFC 01/11] mm/mremap: fix dup_anon_vma() in vma_merge() case 4 Vlastimil Babka
2023-02-24 10:00 ` [RFC 02/11] mm/mmap/vma_merge: use only primary pointers for preparing merge Vlastimil Babka
2023-02-24 10:00 ` [RFC 03/11] mm/mmap/vma_merge: use the proper vma pointer in case 3 Vlastimil Babka
2023-02-24 10:00 ` [RFC 04/11] mm/mmap/vma_merge: use the proper vma pointers in cases 1 and 6 Vlastimil Babka
2023-02-24 10:00 ` [RFC 05/11] mm/mmap/vma_merge: use the proper vma pointer in case 4 Vlastimil Babka
2023-02-24 10:00 ` Vlastimil Babka [this message]
2023-02-24 10:00 ` [RFC 07/11] mm/mmap/vma_merge: set mid to NULL if not applicable Vlastimil Babka
2023-02-24 10:00 ` [RFC 08/11] mm/mmap/vma_merge: rename adj_next to adj_start Vlastimil Babka
2023-02-24 10:00 ` [RFC 09/11] mm/mmap/vma_merge: convert mergeability checks to return bool Vlastimil Babka
2023-02-24 10:00 ` [RFC 10/11] mm/mmap: start distinguishing if vma can be removed in mergeability test Vlastimil Babka
2023-02-24 10:00 ` [RFC 11/11] mm/mremap: simplify vma expansion again Vlastimil Babka
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=20230224100022.11268-7-vbabka@suse.cz \
--to=vbabka@suse.cz \
--cc=Liam.Howlett@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
--cc=patches@lists.linux.dev \
/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).