git: 032014aaae70 - stable/14 - socket: wrap ktrsplice call with KTRACE ifdef
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 17 Oct 2024 16:16:40 UTC
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=032014aaae70c7166b714eb911ccb5b86213f837
commit 032014aaae70c7166b714eb911ccb5b86213f837
Author: Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2024-09-16 01:46:00 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-10-17 15:49:11 +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
(cherry picked from commit 75cd1e534c75fbdd3294debe6edea27e780bc5f1)
---
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 edd26f28a292..1f5e09ada217 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -3951,7 +3951,9 @@ sosetopt(struct socket *so, struct sockopt *sopt)
}
if (error)
goto bad;
+#ifdef KTRACE
ktrsplice(&splice);
+#endif
error = splice_init();
if (error != 0)