Commit bc069da6 authored by Rong Tao's avatar Rong Tao Committed by Andrii Nakryiko
Browse files

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



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

Signed-off-by: default avatarRong Tao <rtoax@foxmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/tencent_1CC476835C219FACD84B6715F0D785517E07@qq.com
parent bfa8fe95

samples/bpf/task_fd_query_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ int bpf_prog1(struct pt_regs *ctx) 
	return 0;

}



SEC("kretprobe/blk_account_io_done")

SEC("kretprobe/__blk_account_io_done")

int bpf_prog2(struct pt_regs *ctx)

{

	return 0;

samples/bpf/task_fd_query_user.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ int main(int argc, char **argv) 
	/* test two functions in the corresponding *_kern.c file */

	CHECK_AND_RET(test_debug_fs_kprobe(0, "blk_mq_start_request",

					   BPF_FD_TYPE_KPROBE));

	CHECK_AND_RET(test_debug_fs_kprobe(1, "blk_account_io_done",

	CHECK_AND_RET(test_debug_fs_kprobe(1, "__blk_account_io_done",

					   BPF_FD_TYPE_KRETPROBE));



	/* test nondebug fs kprobe */

samples/bpf/tracex3_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct { 
	__uint(max_entries, SLOTS);

} lat_map SEC(".maps");



SEC("kprobe/blk_account_io_done")

SEC("kprobe/__blk_account_io_done")

int bpf_prog2(struct pt_regs *ctx)

{

	long rq = PT_REGS_PARM1(ctx);