Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 4 Aug 2018 20:16:36 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r337327 - head/sys/kern
Message-ID:  <201808042016.w74KGa6Q001580@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Sat Aug  4 20:16:36 2018
New Revision: 337327
URL: https://svnweb.freebsd.org/changeset/base/337327

Log:
  Style.

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Sat Aug  4 20:04:40 2018	(r337326)
+++ head/sys/kern/uipc_usrreq.c	Sat Aug  4 20:16:36 2018	(r337327)
@@ -357,33 +357,32 @@ unp_pcb_lock2(struct unpcb *unp, struct unpcb *unp2)
 }
 
 static __noinline void
-unp_pcb_owned_lock2_slowpath(struct unpcb *unp, struct unpcb **unp2p, int *freed)
-
+unp_pcb_owned_lock2_slowpath(struct unpcb *unp, struct unpcb **unp2p,
+    int *freed)
 {
 	struct unpcb *unp2;
 
 	unp2 = *unp2p;
-	unp_pcb_hold((unp2));
-	UNP_PCB_UNLOCK((unp));
-	UNP_PCB_LOCK((unp2));
-	UNP_PCB_LOCK((unp));
-	*freed = unp_pcb_rele((unp2));
+	unp_pcb_hold(unp2);
+	UNP_PCB_UNLOCK(unp);
+	UNP_PCB_LOCK(unp2);
+	UNP_PCB_LOCK(unp);
+	*freed = unp_pcb_rele(unp2);
 	if (*freed)
 		*unp2p = NULL;
 }
 
-#define unp_pcb_owned_lock2(unp, unp2, freed) do {					\
-		freed = 0;													\
-		UNP_PCB_LOCK_ASSERT((unp));									\
-		UNP_PCB_UNLOCK_ASSERT((unp2));								\
-		MPASS(unp != unp2);											\
-		if (__predict_true(UNP_PCB_TRYLOCK((unp2))))				\
-			break;													\
-		else if ((uintptr_t)(unp2) > (uintptr_t)(unp))				\
-			UNP_PCB_LOCK((unp2));									\
-		else {														\
-			unp_pcb_owned_lock2_slowpath((unp), &(unp2), &freed);	\
-		}															\
+#define unp_pcb_owned_lock2(unp, unp2, freed) do {			\
+	freed = 0;							\
+	UNP_PCB_LOCK_ASSERT(unp);					\
+	UNP_PCB_UNLOCK_ASSERT(unp2);					\
+	MPASS((unp) != (unp2));						\
+	if (__predict_true(UNP_PCB_TRYLOCK(unp2)))			\
+		break;							\
+	else if ((uintptr_t)(unp2) > (uintptr_t)(unp))			\
+		UNP_PCB_LOCK(unp2);					\
+	else								\
+		unp_pcb_owned_lock2_slowpath((unp), &(unp2), &freed);	\
 } while (0)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808042016.w74KGa6Q001580>