mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

bcachefs: Rename struct field swap to prevent macro naming collision 

The struct field swap can collide with the swap() macro defined in
linux/minmax.h. Rename the struct field to prevent such collisions.

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Thorsten Blum 2024-04-06 16:19:20 +02:00 committed by Kent Overstreet
parent 7d83cf53c7
commit 2d793e9315
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/bcachefs/eytzinger.c
View File

@ -115,7 +115,7 @@ static void swap_bytes(void *a, void *b, size_t n)
struct wrapper { struct wrapper {
cmp_func_t cmp; cmp_func_t cmp;
swap_func_t swap; swap_func_t swap_func;
}; };
/* /*
@ -125,7 +125,7 @@ struct wrapper {
static void do_swap(void *a, void *b, size_t size, swap_r_func_t swap_func, const void *priv) static void do_swap(void *a, void *b, size_t size, swap_r_func_t swap_func, const void *priv)
{ {
if (swap_func == SWAP_WRAPPER) { if (swap_func == SWAP_WRAPPER) {
((const struct wrapper *)priv)->swap(a, b, (int)size); ((const struct wrapper *)priv)->swap_func(a, b, (int)size);
return; return;
} }
@ -174,7 +174,7 @@ void eytzinger0_sort_r(void *base, size_t n, size_t size,
int i, c, r; int i, c, r;
/* called from 'sort' without swap function, let's pick the default */ /* called from 'sort' without swap function, let's pick the default */
if (swap_func == SWAP_WRAPPER && !((struct wrapper *)priv)->swap) if (swap_func == SWAP_WRAPPER && !((struct wrapper *)priv)->swap_func)
swap_func = NULL; swap_func = NULL;
if (!swap_func) { if (!swap_func) {
@ -227,7 +227,7 @@ void eytzinger0_sort(void *base, size_t n, size_t size,
{ {
struct wrapper w = { struct wrapper w = {
.cmp = cmp_func, .cmp = cmp_func,
.swap = swap_func, .swap_func = swap_func,
}; };
return eytzinger0_sort_r(base, n, size, _CMP_WRAPPER, SWAP_WRAPPER, &w); return eytzinger0_sort_r(base, n, size, _CMP_WRAPPER, SWAP_WRAPPER, &w);