Date: Fri, 20 Sep 2024 11:53:20 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 75cd1e534c75 - main - socket: wrap ktrsplice call with KTRACE ifdef Message-ID: <202409201153.48KBrKY5037355@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=75cd1e534c75fbdd3294debe6edea27e780bc5f1 commit 75cd1e534c75fbdd3294debe6edea27e780bc5f1 Author: Siva Mahadevan <me@svmhdvn.name> AuthorDate: 2024-09-16 01:46:00 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2024-09-20 11:34:04 +0000 socket: wrap ktrsplice call with KTRACE ifdef This fixes a build error when the kernel is built without KTRACE support. Reviewed by: emaste, markj Fixes: a1da7dc1cdad ("socket: Implement SO_SPLICE") Pull Request: https://github.com/freebsd/freebsd-src/pull/1426 --- sys/kern/uipc_socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 071530925892..fb3dc4dfc224 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3954,7 +3954,9 @@ sosetopt(struct socket *so, struct sockopt *sopt) } if (error) goto bad; +#ifdef KTRACE ktrsplice(&splice); +#endif error = splice_init(); if (error != 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409201153.48KBrKY5037355>