Skip to content

Commit 11e17ae

Browse files
Jiapeng Chongborkmann
authored andcommitted
bpf: Use swap() instead of open coding it
Clean the following coccicheck warning: ./kernel/trace/bpf_trace.c:2263:34-35: WARNING opportunity for swap(). ./kernel/trace/bpf_trace.c:2264:40-41: WARNING opportunity for swap(). Reported-by: Abaci Robot <[email protected]> Signed-off-by: Jiapeng Chong <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 38608ee commit 11e17ae

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

kernel/trace/bpf_trace.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,15 +2254,13 @@ static void bpf_kprobe_multi_cookie_swap(void *a, void *b, int size, const void
22542254
const struct bpf_kprobe_multi_link *link = priv;
22552255
unsigned long *addr_a = a, *addr_b = b;
22562256
u64 *cookie_a, *cookie_b;
2257-
unsigned long tmp1;
2258-
u64 tmp2;
22592257

22602258
cookie_a = link->cookies + (addr_a - link->addrs);
22612259
cookie_b = link->cookies + (addr_b - link->addrs);
22622260

22632261
/* swap addr_a/addr_b and cookie_a/cookie_b values */
2264-
tmp1 = *addr_a; *addr_a = *addr_b; *addr_b = tmp1;
2265-
tmp2 = *cookie_a; *cookie_a = *cookie_b; *cookie_b = tmp2;
2262+
swap(*addr_a, *addr_b);
2263+
swap(*cookie_a, *cookie_b);
22662264
}
22672265

22682266
static int __bpf_kprobe_multi_cookie_cmp(const void *a, const void *b)

0 commit comments

Comments
 (0)