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.com Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com> Reviewed-by: Baoquan He <bhe@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Lorenzo 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: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
38f6b9af04
commit
5b75b8e1b9
13
mm/vmalloc.c
13
mm/vmalloc.c
|
@ -1382,9 +1382,9 @@ classify_va_fit_type(struct vmap_area *va,
|
|||
}
|
||||
|
||||
static __always_inline int
|
||||
adjust_va_to_fit_type(struct rb_root *root, struct list_head *head,
|
||||
struct vmap_area *va, unsigned long nva_start_addr,
|
||||
unsigned long size)
|
||||
va_clip(struct rb_root *root, struct list_head *head,
|
||||
struct vmap_area *va, unsigned long nva_start_addr,
|
||||
unsigned long size)
|
||||
{
|
||||
struct vmap_area *lva = NULL;
|
||||
enum fit_type type = classify_va_fit_type(va, nva_start_addr, size);
|
||||
|
@ -1500,7 +1500,7 @@ va_alloc(struct vmap_area *va,
|
|||
return vend;
|
||||
|
||||
/* 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))
|
||||
return vend;
|
||||
|
||||
|
@ -4155,9 +4155,8 @@ retry:
|
|||
/* It is a BUG(), but trigger recovery instead. */
|
||||
goto recovery;
|
||||
|
||||
ret = adjust_va_to_fit_type(&free_vmap_area_root,
|
||||
&free_vmap_area_list,
|
||||
va, start, size);
|
||||
ret = va_clip(&free_vmap_area_root,
|
||||
&free_vmap_area_list, va, start, size);
|
||||
if (WARN_ON_ONCE(unlikely(ret)))
|
||||
/* It is a BUG(), but trigger recovery instead. */
|
||||
goto recovery;
|
||||
|
|
Loading…
Reference in New Issue