Commit 5b75b8e1 authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Andrew Morton

mm: vmalloc: rename adjust_va_to_fit_type() function

This patch renames the adjust_va_to_fit_type() function to va_clip() which
is shorter and more expressive.

There is no a functional change as a result of this patch.

Link: https://lkml.kernel.org/r/20240102184633.748113-3-urezki@gmail.comSigned-off-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: default avatarBaoquan He <bhe@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLorenzo Stoakes <lstoakes@gmail.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Joel Fernandes (Google) <joel@joelfernandes.org>
Cc: Kazuhito Hagio <k-hagio-ab@nec.com>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Oleksiy Avramchenko <oleksiy.avramchenko@sony.com>
Cc: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 38f6b9af
...@@ -1382,9 +1382,9 @@ classify_va_fit_type(struct vmap_area *va, ...@@ -1382,9 +1382,9 @@ classify_va_fit_type(struct vmap_area *va,
} }
static __always_inline int static __always_inline int
adjust_va_to_fit_type(struct rb_root *root, struct list_head *head, va_clip(struct rb_root *root, struct list_head *head,
struct vmap_area *va, unsigned long nva_start_addr, struct vmap_area *va, unsigned long nva_start_addr,
unsigned long size) unsigned long size)
{ {
struct vmap_area *lva = NULL; struct vmap_area *lva = NULL;
enum fit_type type = classify_va_fit_type(va, nva_start_addr, size); enum fit_type type = classify_va_fit_type(va, nva_start_addr, size);
...@@ -1500,7 +1500,7 @@ va_alloc(struct vmap_area *va, ...@@ -1500,7 +1500,7 @@ va_alloc(struct vmap_area *va,
return vend; return vend;
/* Update the free vmap_area. */ /* Update the free vmap_area. */
ret = adjust_va_to_fit_type(root, head, va, nva_start_addr, size); ret = va_clip(root, head, va, nva_start_addr, size);
if (WARN_ON_ONCE(ret)) if (WARN_ON_ONCE(ret))
return vend; return vend;
...@@ -4155,9 +4155,8 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, ...@@ -4155,9 +4155,8 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
/* It is a BUG(), but trigger recovery instead. */ /* It is a BUG(), but trigger recovery instead. */
goto recovery; goto recovery;
ret = adjust_va_to_fit_type(&free_vmap_area_root, ret = va_clip(&free_vmap_area_root,
&free_vmap_area_list, &free_vmap_area_list, va, start, size);
va, start, size);
if (WARN_ON_ONCE(unlikely(ret))) if (WARN_ON_ONCE(unlikely(ret)))
/* It is a BUG(), but trigger recovery instead. */ /* It is a BUG(), but trigger recovery instead. */
goto recovery; goto recovery;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment