From: Vlastimil Babka Date: Wed, 5 Apr 2023 23:02:27 +0000 (-0700) Subject: mm-mmap-start-distinguishing-if-vma-can-be-removed-in-mergeability-test-fix. X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1edd488f05563e2bd9c520dd563af3fd88e70ed7;p=users%2Fjedix%2Flinux-maple.git mm-mmap-start-distinguishing-if-vma-can-be-removed-in-mergeability-test-fix. adjust comment as suggested by Lorenzo Link: https://lkml.kernel.org/r/74f2ea6c-f1a9-6dd7-260c-25e660f42379@suse.cz Signed-off-by: Vlastimil Babka Reviewed-by: Liam R. Howlett Cc: Lorenzo Stoakes Cc: Matthew Wilcox (Oracle) Cc: Suren Baghdasaryan Signed-off-by: Andrew Morton --- diff --git a/mm/mmap.c b/mm/mmap.c index fcbb54d99633..1435aa30d4b0 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -755,8 +755,8 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma, /* * If the vma has a ->close operation then the driver probably needs to release - * per-vma resources, so we don't attempt to merge those in case the caller - * indicates the current vma may be removed as part of the merge. + * per-vma resources, so we don't attempt to merge those if the caller indicates + * the current vma may be removed as part of the merge. */ static inline bool is_mergeable_vma(struct vm_area_struct *vma, struct file *file, unsigned long vm_flags,