From: Wei Yang <richard.weiyang@gmail.com>
To: akpm@linux-foundation.org, lorenzo.stoakes@oracle.com,
vbabka@suse.cz, jannh@google.com
Cc: linux-mm@kvack.org, Wei Yang <richard.weiyang@gmail.com>
Subject: [PATCH] mm/vma: the pgoff is correct if can_merge_right
Date: Thu, 24 Oct 2024 08:42:22 +0000 [thread overview]
Message-ID: <20241024084222.17201-1-richard.weiyang@gmail.com> (raw)
can_merge_right implies can_vma_merge_right() has checked the pgoff.
Don't need to assign it again.
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
CC: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
---
mm/vma.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/mm/vma.c b/mm/vma.c
index 4737afcb064c..fb4f1863f88e 100644
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -915,7 +915,6 @@ struct vm_area_struct *vma_merge_new_range(struct vma_merge_struct *vmg)
unsigned long start = vmg->start;
unsigned long end = vmg->end;
pgoff_t pgoff = vmg->pgoff;
- pgoff_t pglen = PHYS_PFN(end - start);
bool can_merge_left, can_merge_right;
mmap_assert_write_locked(vmg->mm);
@@ -936,7 +935,6 @@ struct vm_area_struct *vma_merge_new_range(struct vma_merge_struct *vmg)
if (can_merge_right) {
vmg->end = next->vm_end;
vmg->vma = next;
- vmg->pgoff = next->vm_pgoff - pglen;
}
/* If we can merge with the previous VMA, adjust vmg accordingly. */
--
2.34.1
next reply other threads:[~2024-10-24 8:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-24 8:42 Wei Yang [this message]
2024-10-24 9:03 ` Lorenzo Stoakes
2024-10-24 9:10 ` Wei Yang
2024-10-24 9:18 ` Lorenzo Stoakes
2024-10-24 9:22 ` Wei Yang
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=20241024084222.17201-1-richard.weiyang@gmail.com \
--to=richard.weiyang@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jannh@google.com \
--cc=linux-mm@kvack.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=vbabka@suse.cz \
/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