All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vlastimil Babka <vbabka@suse.cz>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Liam R. Howlett" <Liam.Howlett@oracle.com>,
	Matthew Wilcox <willy@infradead.org>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	patches@lists.linux.dev, maple-tree@lists.infradead.org,
	Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH 05/10] mm/mmap/vma_merge: initialize mid and next in natural order
Date: Thu,  9 Mar 2023 12:12:53 +0100	[thread overview]
Message-ID: <20230309111258.24079-6-vbabka@suse.cz> (raw)
In-Reply-To: <20230309111258.24079-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 420d6847c94c..be60b344e4b1 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


  parent reply	other threads:[~2023-03-09 11:13 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-09 11:12 [PATCH 00/10] cleanup vma_merge() and improve mergeability tests Vlastimil Babka
2023-03-09 11:12 ` [PATCH 01/10] mm/mmap/vma_merge: use only primary pointers for preparing merge Vlastimil Babka
2023-03-14 22:52   ` Lorenzo Stoakes
2023-03-09 11:12 ` [PATCH 02/10] mm/mmap/vma_merge: use the proper vma pointer in case 3 Vlastimil Babka
2023-03-15 19:04   ` Lorenzo Stoakes
2023-03-09 11:12 ` [PATCH 03/10] mm/mmap/vma_merge: use the proper vma pointers in cases 1 and 6 Vlastimil Babka
2023-03-15 19:43   ` Lorenzo Stoakes
2023-03-09 11:12 ` [PATCH 04/10] mm/mmap/vma_merge: use the proper vma pointer in case 4 Vlastimil Babka
2023-03-15 19:54   ` Lorenzo Stoakes
2023-03-09 11:12 ` Vlastimil Babka [this message]
2023-03-15 20:10   ` [PATCH 05/10] mm/mmap/vma_merge: initialize mid and next in natural order Lorenzo Stoakes
2023-03-09 11:12 ` [PATCH 06/10] mm/mmap/vma_merge: set mid to NULL if not applicable Vlastimil Babka
2023-03-15 21:34   ` Lorenzo Stoakes
2023-03-16 10:11     ` Vlastimil Babka
2023-03-09 11:12 ` [PATCH 07/10] mm/mmap/vma_merge: rename adj_next to adj_start Vlastimil Babka
2023-03-14 22:36   ` Lorenzo Stoakes
2023-03-15 21:38   ` Lorenzo Stoakes
2023-03-09 11:12 ` [PATCH 08/10] mm/mmap/vma_merge: convert mergeability checks to return bool Vlastimil Babka
2023-03-15 21:43   ` Lorenzo Stoakes
2023-03-09 11:12 ` [PATCH 09/10] mm/mmap: start distinguishing if vma can be removed in mergeability test Vlastimil Babka
2023-03-15 22:05   ` Lorenzo Stoakes
2023-03-16 10:57     ` Vlastimil Babka
2023-03-09 11:12 ` [PATCH 10/10] mm/mremap: simplify vma expansion again Vlastimil Babka
2023-03-15 22:20   ` Lorenzo Stoakes
2023-03-16  8:35     ` Vlastimil Babka
2023-03-20 14:16 ` [PATCH 00/10] cleanup vma_merge() and improve mergeability tests Liam R. Howlett

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=20230309111258.24079-6-vbabka@suse.cz \
    --to=vbabka@suse.cz \
    --cc=Liam.Howlett@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=maple-tree@lists.infradead.org \
    --cc=patches@lists.linux.dev \
    --cc=willy@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.