Skip to content

Commit d684430

Browse files
visitorckwakpm00
authored andcommitted
dm vdo: update min_heap_callbacks to use default builtin swap
Replace the swp function pointer in the min_heap_callbacks of dm-vdo with NULL, allowing direct usage of the default builtin swap implementation. This modification simplifies the code and improves performance by removing unnecessary function indirection. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Kuan-Wei Chiu <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Ching-Chun (Jim) Huang <[email protected]> Cc: Coly Li <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Kent Overstreet <[email protected]> Cc: "Liang, Kan" <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Matthew Sakai <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 083ad28 commit d684430

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

drivers/md/dm-vdo/repair.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static void swap_mappings(void *item1, void *item2, void __always_unused *args)
166166

167167
static const struct min_heap_callbacks repair_min_heap = {
168168
.less = mapping_is_less_than,
169-
.swp = swap_mappings,
169+
.swp = NULL,
170170
};
171171

172172
static struct numbered_block_mapping *sort_next_heap_element(struct repair_completion *repair)

drivers/md/dm-vdo/slab-depot.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3301,17 +3301,9 @@ static bool slab_status_is_less_than(const void *item1, const void *item2,
33013301
return info1->slab_number < info2->slab_number;
33023302
}
33033303

3304-
static void swap_slab_statuses(void *item1, void *item2, void __always_unused *args)
3305-
{
3306-
struct slab_status *info1 = item1;
3307-
struct slab_status *info2 = item2;
3308-
3309-
swap(*info1, *info2);
3310-
}
3311-
33123304
static const struct min_heap_callbacks slab_status_min_heap = {
33133305
.less = slab_status_is_less_than,
3314-
.swp = swap_slab_statuses,
3306+
.swp = NULL,
33153307
};
33163308

33173309
/* Inform the slab actor that a action has finished on some slab; used by apply_to_slabs(). */

0 commit comments

Comments
 (0)