Now we have the f_op->mmap_prepare() hook, having a static function called __mmap_prepare() that has nothing to do with it is confusing, so rename the function.
Additionally rename __mmap_complete() to __mmap_epilogue(), as we intend to provide a f_op->mmap_complete() callback. Signed-off-by: Lorenzo Stoakes <[email protected]> --- mm/vma.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index abe0da33c844..0efa4288570e 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -2329,7 +2329,7 @@ static void update_ksm_flags(struct mmap_state *map) } /* - * __mmap_prepare() - Prepare to gather any overlapping VMAs that need to be + * __mmap_prelude() - Prepare to gather any overlapping VMAs that need to be * unmapped once the map operation is completed, check limits, account mapping * and clean up any pre-existing VMAs. * @@ -2338,7 +2338,7 @@ static void update_ksm_flags(struct mmap_state *map) * * Returns: 0 on success, error code otherwise. */ -static int __mmap_prepare(struct mmap_state *map, struct list_head *uf) +static int __mmap_prelude(struct mmap_state *map, struct list_head *uf) { int error; struct vma_iterator *vmi = map->vmi; @@ -2515,13 +2515,13 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap) } /* - * __mmap_complete() - Unmap any VMAs we overlap, account memory mapping + * __mmap_epilogue() - Unmap any VMAs we overlap, account memory mapping * statistics, handle locking and finalise the VMA. * * @map: Mapping state. * @vma: Merged or newly allocated VMA for the mmap()'d region. */ -static void __mmap_complete(struct mmap_state *map, struct vm_area_struct *vma) +static void __mmap_epilogue(struct mmap_state *map, struct vm_area_struct *vma) { struct mm_struct *mm = map->mm; vm_flags_t vm_flags = vma->vm_flags; @@ -2649,7 +2649,7 @@ static unsigned long __mmap_region(struct file *file, unsigned long addr, map.check_ksm_early = can_set_ksm_flags_early(&map); - error = __mmap_prepare(&map, uf); + error = __mmap_prelude(&map, uf); if (!error && have_mmap_prepare) error = call_mmap_prepare(&map); if (error) @@ -2675,11 +2675,11 @@ static unsigned long __mmap_region(struct file *file, unsigned long addr, if (have_mmap_prepare) set_vma_user_defined_fields(vma, &map); - __mmap_complete(&map, vma); + __mmap_epilogue(&map, vma); return addr; - /* Accounting was done by __mmap_prepare(). */ + /* Accounting was done by __mmap_prelude(). */ unacct_error: if (map.charged) vm_unacct_memory(map.charged); -- 2.51.0
