lib min_heap: rename min_heapify() to min_heap_sift_down()

After adding min_heap_sift_up(), the naming convention has been adjusted
to maintain consistency with the min_heap_sift_up().  Consequently,
min_heapify() has been renamed to min_heap_sift_down().

Link: https://lkml.kernel.org/CAP-5=fVcBAxt8Mw72=NCJPRJfjDaJcqk4rjbadgouAEAHz_q1A@mail.gmail.com
Link: https://lkml.kernel.org/r/20240524152958.919343-13-visitorckw@gmail.com
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Brian Foster <bfoster@redhat.com>
Cc: Ching-Chun (Jim) Huang <jserv@ccns.ncku.edu.tw>
Cc: Coly Li <colyli@suse.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Matthew Sakai <msakai@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/md/dm-vdo/repair.c b/drivers/md/dm-vdo/repair.c
index eae990859db4c0041c43904d4cc15b4fdc988897..ff09e4a14333622b526a605410fcb985ec06a8e5 100644 (file)
--- a/drivers/md/dm-vdo/repair.c
+++ b/drivers/md/dm-vdo/repair.c
@@ -183,7 +183,7 @@ static struct numbered_block_mapping *sort_next_heap_element(struct repair_compl
         */
        last = &repair->entries[--heap->nr];
        swap_mappings(heap->data, last, NULL);
-       min_heapify(heap, 0, &repair_min_heap, NULL);
+       min_heap_sift_down(heap, 0, &repair_min_heap, NULL);
        return last;
 }
 

diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h
index 3410a5f907adab12e496527fad6b04de76ceb3ea..0baee5787247fcf58efb48a92479029fbc7e09c3 100644 (file)
--- a/include/linux/min_heap.h
+++ b/include/linux/min_heap.h
@@ -75,7 +75,7 @@ bool __min_heap_full(min_heap_char *heap)
 
 /* Sift the element at pos down the heap. */
 static __always_inline
-void __min_heapify(min_heap_char *heap, int pos, size_t elem_size,
+void __min_heap_sift_down(min_heap_char *heap, int pos, size_t elem_size,
                const struct min_heap_callbacks *func, void *args)
 {
        void *left, *right;
@@ -108,8 +108,8 @@ void __min_heapify(min_heap_char *heap, int pos, size_t elem_size,
        }
 }
 
-#define min_heapify(_heap, _pos, _func, _args) \
-       __min_heapify((min_heap_char *)_heap, _pos, __minheap_obj_size(_heap), _func, _args)
+#define min_heap_sift_down(_heap, _pos, _func, _args)  \
+       __min_heap_sift_down((min_heap_char *)_heap, _pos, __minheap_obj_size(_heap), _func, _args)
 
 /* Sift up ith element from the heap, O(log2(nr)). */
 static __always_inline
@@ -139,7 +139,7 @@ void __min_heapify_all(min_heap_char *heap, size_t elem_size,
        int i;
 
        for (i = heap->nr / 2 - 1; i >= 0; i--)
-               __min_heapify(heap, i, elem_size, func, args);
+               __min_heap_sift_down(heap, i, elem_size, func, args);
 }
 
 #define min_heapify_all(_heap, _func, _args)   \
@@ -158,7 +158,7 @@ bool __min_heap_pop(min_heap_char *heap, size_t elem_size,
        /* Place last element at the root (position 0) and then sift down. */
        heap->nr--;
        memcpy(data, data + (heap->nr * elem_size), elem_size);
-       __min_heapify(heap, 0, elem_size, func, args);
+       __min_heap_sift_down(heap, 0, elem_size, func, args);
 
        return true;
 }
@@ -178,7 +178,7 @@ void __min_heap_pop_push(min_heap_char *heap,
                void *args)
 {
        memcpy(heap->data, element, elem_size);
-       __min_heapify(heap, 0, elem_size, func, args);
+       __min_heap_sift_down(heap, 0, elem_size, func, args);
 }
 
 #define min_heap_pop_push(_heap, _element, _func, _args)       \
@@ -232,7 +232,7 @@ bool __min_heap_del(min_heap_char *heap, size_t elem_size, size_t idx,
                return true;
        func->swp(data + (idx * elem_size), data + (heap->nr * elem_size), args);
        __min_heap_sift_up(heap, elem_size, idx, func, args);
-       __min_heapify(heap, idx, elem_size, func, args);
+       __min_heap_sift_down(heap, idx, elem_size, func, args);
 
        return true;
 }

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 27cafe661740b599df50a0fc6af55f1cc02d3ee7..6da0ab01cfd364a8f46da3484d1528e229e46892 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3795,7 +3795,7 @@ static noinline int visit_groups_merge(struct perf_event_context *ctx,
 
                *evt = perf_event_groups_next(*evt, pmu);
                if (*evt)
-                       min_heapify(&event_heap, 0, &perf_min_heap, NULL);
+                       min_heap_sift_down(&event_heap, 0, &perf_min_heap, NULL);
                else
                        min_heap_pop(&event_heap, &perf_min_heap, NULL);
        }