summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2011-02-11 13:27:00 +0000
committerbz <bz@FreeBSD.org>2011-02-11 13:27:00 +0000
commitaad842be85214268dd72cf02aead5b9bbcfa4377 (patch)
tree64fc40af6909661282c8bb2fc65add4863b0be8d /sys/kern
parenta89333362948433319f235d88ae0bc84cde9dadd (diff)
downloadFreeBSD-src-aad842be85214268dd72cf02aead5b9bbcfa4377.zip
FreeBSD-src-aad842be85214268dd72cf02aead5b9bbcfa4377.tar.gz
Mfp4 CH=177255:
Make VNET_ASSERT() available with either VNET_DEBUG or INVARIANTS. Change the syntax to match KASSERT() to allow more flexible panic messages rather than having a printf with hardcoded arguments before panic. Adjust the few assertions we have to the new format (and enhance the output). Sponsored by: The FreeBSD Foundation Sponsored by: CK Software GmbH Reviewed by: jhb MFC after: 2 weeks
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/uipc_socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index e3e8e28..32e507c 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -437,7 +437,8 @@ sonewconn(struct socket *head, int connstatus)
if (over)
#endif
return (NULL);
- VNET_ASSERT(head->so_vnet);
+ VNET_ASSERT(head->so_vnet != NULL, ("%s:%d so_vnet is NULL, head=%p",
+ __func__, __LINE__, head));
so = soalloc(head->so_vnet);
if (so == NULL)
return (NULL);
OpenPOWER on IntegriCloud