From 686cb9366703677531033540515b1eead96becce Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Wed, 11 Jan 2012 13:57:48 +0000 Subject: [PATCH] When running with INVARIANTS the mutex(9) code does all necessary asserts for non-recursive mutexes. --- sys/contrib/pf/net/pfvar.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/contrib/pf/net/pfvar.h b/sys/contrib/pf/net/pfvar.h index 5b47eee0929d..fe4c0ced945d 100644 --- a/sys/contrib/pf/net/pfvar.h +++ b/sys/contrib/pf/net/pfvar.h @@ -241,15 +241,8 @@ extern struct mtx pf_task_mtx; #define PF_LOCK_ASSERT() mtx_assert(&pf_task_mtx, MA_OWNED) #define PF_UNLOCK_ASSERT() mtx_assert(&pf_task_mtx, MA_NOTOWNED) - -#define PF_LOCK() do { \ - PF_UNLOCK_ASSERT(); \ - mtx_lock(&pf_task_mtx); \ -} while(0) -#define PF_UNLOCK() do { \ - PF_LOCK_ASSERT(); \ - mtx_unlock(&pf_task_mtx); \ -} while(0) +#define PF_LOCK() mtx_lock(&pf_task_mtx) +#define PF_UNLOCK() mtx_unlock(&pf_task_mtx) #else #define PF_LOCK_ASSERT() #define PF_UNLOCK_ASSERT()