diff options
| author | Liam R. Howlett <Liam.Howlett@Oracle.com> | 2023-01-20 17:26:49 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-02-10 01:51:38 +0100 |
| commit | 0503ea8f5ba73eb3ab13a81c1eefbaf51405385a (patch) | |
| tree | 114cd3eabef71df5f850d81e6d60f6add7ac36ae /mm/filemap.c | |
| parent | mm/mmap: convert do_brk_flags() to use vma_prepare() and vma_complete() (diff) | |
| download | linux-0503ea8f5ba73eb3ab13a81c1eefbaf51405385a.tar.xz linux-0503ea8f5ba73eb3ab13a81c1eefbaf51405385a.zip | |
mm/mmap: remove __vma_adjust()
Inline the work of __vma_adjust() into vma_merge(). This reduces code
size and has the added benefits of the comments for the cases being
located with the code.
Change the comments referencing vma_adjust() accordingly.
[Liam.Howlett@oracle.com: fix vma_merge() offset when expanding the next vma]
Link: https://lkml.kernel.org/r/20230130195713.2881766-1-Liam.Howlett@oracle.com
Link: https://lkml.kernel.org/r/20230120162650.984577-49-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index c915ded191f0..992554c18f1f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -97,7 +97,7 @@ * ->i_pages lock (__sync_single_inode) * * ->i_mmap_rwsem - * ->anon_vma.lock (vma_adjust) + * ->anon_vma.lock (vma_merge) * * ->anon_vma.lock * ->page_table_lock or pte_lock (anon_vma_prepare and various) |