From 499dccd69baa7e7fe479a54b964409bfb8b45fd2 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Sat, 13 Jun 2020 13:58:10 -0400 Subject: [PATCH] FreeBSD: Don't require zeroing new locks before init This has not shown to be of use enough to justify the inconvenience. Reviewed-by: Matt Macy Reviewed-by: Alexander Motin Reviewed-by: Allan Jude Signed-off-by: Ryan Moeller Closes #10449 --- include/os/freebsd/spl/sys/mutex.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/os/freebsd/spl/sys/mutex.h b/include/os/freebsd/spl/sys/mutex.h index ef556872a2bd..e757d12c1502 100644 --- a/include/os/freebsd/spl/sys/mutex.h +++ b/include/os/freebsd/spl/sys/mutex.h @@ -39,7 +39,7 @@ typedef struct sx kmutex_t; #include typedef enum { - MUTEX_DEFAULT = 6 /* kernel default mutex */ + MUTEX_DEFAULT = 0 /* kernel default mutex */ } kmutex_type_t; #define MUTEX_HELD(x) (mutex_owned(x)) @@ -53,9 +53,7 @@ typedef enum { #define mutex_init(lock, desc, type, arg) do { \ const char *_name; \ - ASSERT((type) == 0 || (type) == MUTEX_DEFAULT); \ - KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ - LO_EXPECTED, ("lock %s already initialized", #lock)); \ + ASSERT((type) == MUTEX_DEFAULT); \ for (_name = #lock; *_name != '\0'; _name++) { \ if (*_name >= 'a' && *_name <= 'z') \ break; \