From: guenther <guenther@openbsd.org>
Date: Mon, 19 Jan 2015 20:13:03 +0000 (+0000)
Subject: Fix bracing in ASSERT_VP_ISLOCKED(vp) macro to not always panic()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d8d0cf1ac91608b9bc0b073cd06266c953915ec0;p=openbsd

Fix bracing in ASSERT_VP_ISLOCKED(vp) macro to not always panic()

From Helg (xx404 (at) msn.com)
---

diff --git a/sys/kern/vfs_vops.c b/sys/kern/vfs_vops.c
index f7ec9a52b03..fa23acebc03 100644
--- a/sys/kern/vfs_vops.c
+++ b/sys/kern/vfs_vops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_vops.c,v 1.9 2013/08/13 05:52:24 guenther Exp $	*/
+/*	$OpenBSD: vfs_vops.c,v 1.10 2015/01/19 20:13:03 guenther Exp $	*/
 /*
  * Copyright (c) 2010 Thordur I. Bjornsson <thib@openbsd.org> 
  *
@@ -48,10 +48,11 @@
 #include <sys/unistd.h>
 
 #ifdef VFSLCKDEBUG
-#define ASSERT_VP_ISLOCKED(vp) do {                             \
-        if (((vp)->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp))   \
-                VOP_PRINT(vp);                                  \
-                panic("vp not locked");                         \
+#define ASSERT_VP_ISLOCKED(vp) do {				\
+	if (((vp)->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp)) {	\
+		VOP_PRINT(vp);					\
+		panic("vp not locked");				\
+	}							\
 } while (0)
 #else
 #define ASSERT_VP_ISLOCKED(vp)  /* nothing */