From owner-svn-src-all@freebsd.org  Sat May 19 05:37:59 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4753AEEFB38;
 Sat, 19 May 2018 05:37:59 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id DAC048016D;
 Sat, 19 May 2018 05:37:58 +0000 (UTC)
 (envelope-from mmacy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBCCF22D49;
 Sat, 19 May 2018 05:37:58 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4J5bw2e068935;
 Sat, 19 May 2018 05:37:58 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4J5bwxR068934;
 Sat, 19 May 2018 05:37:58 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201805190537.w4J5bwxR068934@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Sat, 19 May 2018 05:37:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r333866 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 333866
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 May 2018 05:37:59 -0000

Author: mmacy
Date: Sat May 19 05:37:58 2018
New Revision: 333866
URL: https://svnweb.freebsd.org/changeset/base/333866

Log:
  AF_UNIX: switch to annotations to avoid warnings

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Sat May 19 05:37:18 2018	(r333865)
+++ head/sys/kern/uipc_usrreq.c	Sat May 19 05:37:58 2018	(r333866)
@@ -1678,9 +1678,7 @@ static void
 unp_disconnect(struct unpcb *unp, struct unpcb *unp2)
 {
 	struct socket *so, *so2;
-#ifdef INVARIANTS
-	int freed;
-#endif
+	int freed __unused;
 
 	KASSERT(unp2 != NULL, ("unp_disconnect: unp2 == NULL"));
 
@@ -1716,15 +1714,9 @@ unp_disconnect(struct unpcb *unp, struct unpcb *unp2)
 			soisdisconnected(so2);
 		break;
 	}
-#ifdef INVARIANTS	
-	freed =
-#endif		
-		unp_pcb_rele(unp);
+	freed = unp_pcb_rele(unp);
 	MPASS(freed == 0);
-#ifdef INVARIANTS	
-	freed =
-#endif
-		unp_pcb_rele(unp2);
+	freed = unp_pcb_rele(unp2);
 	MPASS(freed == 0);
 }