Commit f41f036b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton

mm: remove __vfree

__vfree is a subset of vfree that just skips a few checks, and which is
only used by vfree and an error cleanup path.  Fold __vfree into vfree and
switch the only other caller to call vfree() instead.

Link: https://lkml.kernel.org/r/20230121071051.1143058-3-hch@lst.deSigned-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 37f3605e
...@@ -2786,14 +2786,6 @@ void vfree_atomic(const void *addr) ...@@ -2786,14 +2786,6 @@ void vfree_atomic(const void *addr)
__vfree_deferred(addr); __vfree_deferred(addr);
} }
static void __vfree(const void *addr)
{
if (unlikely(in_interrupt()))
__vfree_deferred(addr);
else
__vunmap(addr, 1);
}
/** /**
* vfree - Release memory allocated by vmalloc() * vfree - Release memory allocated by vmalloc()
* @addr: Memory base address * @addr: Memory base address
...@@ -2821,8 +2813,10 @@ void vfree(const void *addr) ...@@ -2821,8 +2813,10 @@ void vfree(const void *addr)
if (!addr) if (!addr)
return; return;
if (unlikely(in_interrupt()))
__vfree(addr); __vfree_deferred(addr);
else
__vunmap(addr, 1);
} }
EXPORT_SYMBOL(vfree); EXPORT_SYMBOL(vfree);
...@@ -3089,7 +3083,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, ...@@ -3089,7 +3083,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
/* /*
* If not enough pages were obtained to accomplish an * If not enough pages were obtained to accomplish an
* allocation request, free them via __vfree() if any. * allocation request, free them via vfree() if any.
*/ */
if (area->nr_pages != nr_small_pages) { if (area->nr_pages != nr_small_pages) {
warn_alloc(gfp_mask, NULL, warn_alloc(gfp_mask, NULL,
...@@ -3129,7 +3123,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, ...@@ -3129,7 +3123,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
return area->addr; return area->addr;
fail: fail:
__vfree(area->addr); vfree(area->addr);
return NULL; return NULL;
} }
......
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