diff options
| author |   guenther <guenther@openbsd.org> | 2015-01-19 20:13:03 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2015-01-19 20:13:03 +0000 |
| commit | d8d0cf1ac91608b9bc0b073cd06266c953915ec0 (patch) | |
| tree | 7abd27f6d228bd58b46434c7a994adc3406581da | |
| parent | move dispatch to struct ssh; ok djm@ (diff) | |
| download | wireguard-openbsd-d8d0cf1ac91608b9bc0b073cd06266c953915ec0.tar.xz wireguard-openbsd-d8d0cf1ac91608b9bc0b073cd06266c953915ec0.zip | |
Fix bracing in ASSERT_VP_ISLOCKED(vp) macro to not always panic()
From Helg (xx404 (at) msn.com)
| -rw-r--r-- | sys/kern/vfs_vops.c | 11 |
1 files changed, 6 insertions, 5 deletions
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 */ |