From owner-svn-src-projects@freebsd.org Mon May 16 22:33:50 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B8A2B3D5E7 for ; Mon, 16 May 2016 22:33:50 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 249FE11F4; Mon, 16 May 2016 22:33:50 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4GMXnUQ068723; Mon, 16 May 2016 22:33:49 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4GMXnRb068720; Mon, 16 May 2016 22:33:49 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201605162233.u4GMXnRb068720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Mon, 16 May 2016 22:33:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r299980 - in projects/vnet: share/man/man9 sys/kern sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2016 22:33:50 -0000 Author: bz Date: Mon May 16 22:33:48 2016 New Revision: 299980 URL: https://svnweb.freebsd.org/changeset/base/299980 Log: Rather than having a printf under INVARIANTS, make 3rd party code fail compile by removing pr_destroy; otherwise unhappiness will most likely follow on VNET destroy or module unload. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/share/man/man9/domain.9 projects/vnet/sys/kern/uipc_domain.c projects/vnet/sys/sys/protosw.h Modified: projects/vnet/share/man/man9/domain.9 ============================================================================== --- projects/vnet/share/man/man9/domain.9 Mon May 16 22:16:54 2016 (r299979) +++ projects/vnet/share/man/man9/domain.9 Mon May 16 22:33:48 2016 (r299980) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 6, 2014 +.Dd May 16, 2016 .Dt DOMAIN 9 .Os .Sh NAME @@ -105,7 +105,6 @@ struct protosw { pr_ctloutput_t *pr_ctloutput; /* control output (from above) */ /* utility hooks */ pr_init_t *pr_init; - pr_destroy_t *pr_destroy; pr_fasttimo_t *pr_fasttimo; /* fast timeout (200ms) */ pr_slowtimo_t *pr_slowtimo; /* slow timeout (500ms) */ pr_drain_t *pr_drain; /* flush any excess space possible */ Modified: projects/vnet/sys/kern/uipc_domain.c ============================================================================== --- projects/vnet/sys/kern/uipc_domain.c Mon May 16 22:16:54 2016 (r299979) +++ projects/vnet/sys/kern/uipc_domain.c Mon May 16 22:33:48 2016 (r299980) @@ -196,15 +196,7 @@ void vnet_domain_uninit(void *arg) { struct domain *dp = arg; - struct protosw *pr; - for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) - if (pr->pr_destroy) { -#ifdef INVARIANTS - printf("%s: pr %p called pr_destroy\n", __func__, pr); -#endif - (*pr->pr_destroy)(); - } if (dp->dom_destroy) (*dp->dom_destroy)(); } Modified: projects/vnet/sys/sys/protosw.h ============================================================================== --- projects/vnet/sys/sys/protosw.h Mon May 16 22:16:54 2016 (r299979) +++ projects/vnet/sys/sys/protosw.h Mon May 16 22:33:48 2016 (r299980) @@ -70,7 +70,6 @@ typedef int pr_output_t (struct mbuf *, typedef void pr_ctlinput_t (int, struct sockaddr *, void *); typedef int pr_ctloutput_t (struct socket *, struct sockopt *); typedef void pr_init_t (void); -typedef void pr_destroy_t (void); typedef void pr_fasttimo_t (void); typedef void pr_slowtimo_t (void); typedef void pr_drain_t (void); @@ -87,7 +86,6 @@ struct protosw { pr_ctloutput_t *pr_ctloutput; /* control output (from above) */ /* utility hooks */ pr_init_t *pr_init; - pr_destroy_t *pr_destroy; pr_fasttimo_t *pr_fasttimo; /* fast timeout (200ms) */ pr_slowtimo_t *pr_slowtimo; /* slow timeout (500ms) */ pr_drain_t *pr_drain; /* flush any excess space possible */