Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

lib min_heap: update min_heap_push() to use min_heap_sift_up()

Update min_heap_push() to use min_heap_sift_up() rather than its origin
inline version.

Link: https://lkml.kernel.org/r/20240524152958.919343-14-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>

authored by

Kuan-Wei Chiu and committed by
Andrew Morton
e596930f bfe31271

+1 -8
+1 -8
include/linux/min_heap.h
··· 190 190 const struct min_heap_callbacks *func, void *args) 191 191 { 192 192 void *data = heap->data; 193 - void *child, *parent; 194 193 int pos; 195 194 196 195 if (WARN_ONCE(heap->nr >= heap->size, "Pushing on a full heap")) ··· 201 202 heap->nr++; 202 203 203 204 /* Sift child at pos up. */ 204 - for (; pos > 0; pos = (pos - 1) / 2) { 205 - child = data + (pos * elem_size); 206 - parent = data + ((pos - 1) / 2) * elem_size; 207 - if (func->less(parent, child, args)) 208 - break; 209 - func->swp(parent, child, args); 210 - } 205 + __min_heap_sift_up(heap, elem_size, pos, func, args); 211 206 212 207 return true; 213 208 }