[142/158] mm/mmap.c: make vma_merge() comment more easy to understand

Commit Message

Andrew Morton Dec. 1, 2019, 1:57 a.m. UTC

From: Wei Yang <[e-mail]>
Subject: mm/mmap.c: make vma_merge() comment more easy to understand

Case 1/6, 2/7 and 3/8 have the same pattern and we handle them in the
same logic.

Rearrange the comment to make it a little easy for audience to
understand.

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Wei Yang <[e-mail]>
Cc: Mike Rapoport <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Catalin Marinas <[e-mail]>
Cc: Andrea Arcangeli <[e-mail]>
Cc: Jann Horn <[e-mail]>
Cc: Darrick J. Wong <[e-mail]>
Cc: Steve Capper <[e-mail]>
Cc: Michel Lespinasse <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: Yangtao Li <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/mmap.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Patch

--- a/mm/mmap.c~mm-mmapc-make-vma_merge-comment-more-easy-to-understand
+++ a/mm/mmap.c
@@ -1091,15 +1091,18 @@  can_vma_merge_after(struct vm_area_struc
  * the area passed down from mprotect_fixup, never extending beyond one
  * vma, PPPPPP is the prev vma specified, and NNNNNN the next vma after:
  *
- *     AAAA             AAAA                AAAA          AAAA
- *    PPPPPPNNNNNN    PPPPPPNNNNNN    PPPPPPNNNNNN    PPPPNNNNXXXX
- *    cannot merge    might become    might become    might become
- *                    PPNNNNNNNNNN    PPPPPPPPPPNN    PPPPPPPPPPPP 6 or
- *    mmap, brk or    case 4 below    case 5 below    PPPPPPPPXXXX 7 or
- *    mremap move:                                    PPPPXXXXXXXX 8
- *        AAAA
- *    PPPP    NNNN    PPPPPPPPPPPP    PPPPPPPPNNNN    PPPPNNNNNNNN
- *    might become    case 1 below    case 2 below    case 3 below
+ *     AAAA             AAAA                   AAAA
+ *    PPPPPPNNNNNN    PPPPPPNNNNNN       PPPPPPNNNNNN
+ *    cannot merge    might become       might become
+ *                    PPNNNNNNNNNN       PPPPPPPPPPNN
+ *    mmap, brk or    case 4 below       case 5 below
+ *    mremap move:
+ *                        AAAA               AAAA
+ *                    PPPP    NNNN       PPPPNNNNXXXX
+ *                    might become       might become
+ *                    PPPPPPPPPPPP 1 or  PPPPPPPPPPPP 6 or
+ *                    PPPPPPPPNNNN 2 or  PPPPPPPPXXXX 7 or
+ *                    PPPPNNNNNNNN 3     PPPPXXXXXXXX 8
  *
  * It is important for case 8 that the vma NNNN overlapping the
  * region AAAA is never going to extended over XXXX. Instead XXXX must