Commit bf24196d authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Peng Zhang
Browse files

mm: vmalloc: rename adjust_va_to_fit_type() function 

mainline inclusion
from mainline-v6.9-rc1
commit 5b75b8e1b9040b34f43809b1948eaa4e83e39112
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHG1
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5b75b8e1b9040b34f43809b1948eaa4e83e39112

-------------------------------------------------

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: 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>
(cherry picked from commit 5b75b8e1b9040b34f43809b1948eaa4e83e39112)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 6e9c9440

mm/vmalloc.c

+6 −7
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ 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,

va_clip(struct rb_root *root, struct list_head *head,

		struct vmap_area *va, unsigned long nva_start_addr,

		unsigned long size)

{
@@ -1572,7 +1572,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;
@@ -4232,9 +4232,8 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, 
			/* 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;