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

samples/bpf: Replace blk_account_io_done() with __blk_account_io_done()

Since commit be6bfe36db17 ("block: inline hot paths of blk_account_io_*()")
blk_account_io_*() become inline functions.

Signed-off-by: Rong Tao <rtoax@foxmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/tencent_1CC476835C219FACD84B6715F0D785517E07@qq.com

authored by

Rong Tao and committed by
Andrii Nakryiko
bc069da6 bfa8fe95

+3 -3
+1 -1
samples/bpf/task_fd_query_kern.c
··· 10 10 return 0; 11 11 } 12 12 13 - SEC("kretprobe/blk_account_io_done") 13 + SEC("kretprobe/__blk_account_io_done") 14 14 int bpf_prog2(struct pt_regs *ctx) 15 15 { 16 16 return 0;
+1 -1
samples/bpf/task_fd_query_user.c
··· 348 348 /* test two functions in the corresponding *_kern.c file */ 349 349 CHECK_AND_RET(test_debug_fs_kprobe(0, "blk_mq_start_request", 350 350 BPF_FD_TYPE_KPROBE)); 351 - CHECK_AND_RET(test_debug_fs_kprobe(1, "blk_account_io_done", 351 + CHECK_AND_RET(test_debug_fs_kprobe(1, "__blk_account_io_done", 352 352 BPF_FD_TYPE_KRETPROBE)); 353 353 354 354 /* test nondebug fs kprobe */
+1 -1
samples/bpf/tracex3_kern.c
··· 49 49 __uint(max_entries, SLOTS); 50 50 } lat_map SEC(".maps"); 51 51 52 - SEC("kprobe/blk_account_io_done") 52 + SEC("kprobe/__blk_account_io_done") 53 53 int bpf_prog2(struct pt_regs *ctx) 54 54 { 55 55 long rq = PT_REGS_PARM1(ctx);