Author: bz
Date: Wed Nov 26 12:54:31 2008
New Revision: 185333
URL: http://svn.freebsd.org/changeset/base/185333
Log:
Unify the v4 and v6 versions of pcbdetach and pcbfree as good
as possible so that they are easily diffable.
No functional changes.
Reviewed by: rwatson
MFC after: 6 weeks
Modified:
head/sys/netinet/in_pcb.c
head/sys/netinet6/in6_pcb.c
Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c Wed Nov 26 12:24:18 2008 (r185332)
+++ head/sys/netinet/in_pcb.c Wed Nov 26 12:54:31 2008 (r185333)
@@ -877,7 +877,7 @@ void
in_pcbdetach(struct inpcb *inp)
{
- KASSERT(inp->inp_socket != NULL, ("in_pcbdetach: inp_socket == NULL"));
+ KASSERT(inp->inp_socket != NULL, ("%s: inp_socket == NULL", __func__));
inp->inp_socket->so_pcb = NULL;
inp->inp_socket = NULL;
@@ -892,14 +892,14 @@ in_pcbfree(struct inpcb *inp)
{
struct inpcbinfo *ipi = inp->inp_pcbinfo;
- KASSERT(inp->inp_socket == NULL, ("in_pcbfree: inp_socket != NULL"));
+ KASSERT(inp->inp_socket == NULL, ("%s: inp_socket != NULL", __func__));
INP_INFO_WLOCK_ASSERT(ipi);
INP_WLOCK_ASSERT(inp);
#ifdef IPSEC
ipsec4_delete_pcbpolicy(inp);
-#endif /*IPSEC*/
+#endif /* IPSEC */
inp->inp_gencnt = ++ipi->ipi_gencnt;
in_pcbremlists(inp);
if (inp->inp_options)
Modified: head/sys/netinet6/in6_pcb.c
==============================================================================
--- head/sys/netinet6/in6_pcb.c Wed Nov 26 12:24:18 2008 (r185332)
+++ head/sys/netinet6/in6_pcb.c Wed Nov 26 12:54:31 2008 (r185333)
@@ -414,7 +414,8 @@ void
in6_pcbdetach(struct inpcb *inp)
{
- KASSERT(inp->inp_socket != NULL, ("in6_pcbdetach: inp_socket == NULL"));
+ KASSERT(inp->inp_socket != NULL, ("%s: inp_socket == NULL", __func__));
+
inp->inp_socket->so_pcb = NULL;
inp->inp_socket = NULL;
}
@@ -424,8 +425,9 @@ in6_pcbfree(struct inpcb *inp)
{
struct inpcbinfo *ipi = inp->inp_pcbinfo;
- KASSERT(inp->inp_socket == NULL, ("in6_pcbfree: inp_socket != NULL"));
- INP_INFO_WLOCK_ASSERT(inp->inp_pcbinfo);
+ KASSERT(inp->inp_socket == NULL, ("%s: inp_socket != NULL", __func__));
+
+ INP_INFO_WLOCK_ASSERT(ipi);
INP_WLOCK_ASSERT(inp);
#ifdef IPSEC
@@ -443,6 +445,7 @@ in6_pcbfree(struct inpcb *inp)
inp_freemoptions(inp->inp_moptions);
inp->inp_vflag = 0;
crfree(inp->inp_cred);
+
#ifdef MAC
mac_inpcb_destroy(inp);
#endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
