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.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: David 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: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 3f3cb48..67fc9d7 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2786,14 +2786,6 @@ void vfree_atomic(const void *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()
  * @addr:  Memory base address
@@ -2821,8 +2813,10 @@ void vfree(const void *addr)
 
        if (!addr)
                return;
-
-       __vfree(addr);
+       if (unlikely(in_interrupt()))
+               __vfree_deferred(addr);
+       else
+               __vunmap(addr, 1);
 }
 EXPORT_SYMBOL(vfree);
 
@@ -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
-        * allocation request, free them via __vfree() if any.
+        * allocation request, free them via vfree() if any.
         */
        if (area->nr_pages != nr_small_pages) {
                warn_alloc(gfp_mask, NULL,
@@ -3129,7 +3123,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
        return area->addr;
 
 fail:
-       __vfree(area->addr);
+       vfree(area->addr);
        return NULL;
 }