lib: add frr_with_mutex() block-wrapper

[mirror_frr.git] / lib / privs.c

diff --git a/lib/privs.c b/lib/privs.c
index a3314c6c3ca977a5782d26e6851ec3720336b5f2..09efedf68460ac3ab3ce749d4203242810ef6fbb 100644 (file)
--- a/lib/privs.c
+++ b/lib/privs.c
@@ -24,6 +24,7 @@
 #include "log.h"
 #include "privs.h"
 #include "memory.h"
+#include "frr_pthread.h"
 #include "lib_errors.h"
 #include "lib/queue.h"
 
@@ -760,8 +761,7 @@ struct zebra_privs_t *_zprivs_raise(struct zebra_privs_t *privs,
         * Serialize 'raise' operations; particularly important for
         * OSes where privs are process-wide.
         */
-       pthread_mutex_lock(&(privs->mutex));
-       {
+       frr_with_mutex(&(privs->mutex)) {
                /* Locate ref-counting object to use */
                refs = get_privs_refs(privs);
 
@@ -775,7 +775,6 @@ struct zebra_privs_t *_zprivs_raise(struct zebra_privs_t *privs,
                        refs->raised_in_funcname = funcname;
                }
        }
-       pthread_mutex_unlock(&(privs->mutex));
 
        return privs;
 }
@@ -791,8 +790,7 @@ void _zprivs_lower(struct zebra_privs_t **privs)
        /* Serialize 'lower privs' operation - particularly important
         * when OS privs are process-wide.
         */
-       pthread_mutex_lock(&(*privs)->mutex);
-       {
+       frr_with_mutex(&(*privs)->mutex) {
                refs = get_privs_refs(*privs);
 
                if (--(refs->refcount) == 0) {
@@ -806,7 +804,6 @@ void _zprivs_lower(struct zebra_privs_t **privs)
                        refs->raised_in_funcname = NULL;
                }
        }
-       pthread_mutex_unlock(&(*privs)->mutex);
 
        *privs = NULL;
 }