Rename backend mutex

diff --git a/servers/lloadd/backend.c b/servers/lloadd/backend.c
index 53fbd414599e75fff603e1e208195ad32cd3b20b..895693b72b9fa691bcebc7ddfa09785507304036 100644 (file)
--- a/servers/lloadd/backend.c
+++ b/servers/lloadd/backend.c
@@ -71,9 +71,9 @@ upstream_name_cb( int result, struct evutil_addrinfo *res, void *arg )
     }
 
     c = upstream_init( s, b );
-    ldap_pvt_thread_mutex_lock( &b->b_lock );
+    ldap_pvt_thread_mutex_lock( &b->b_mutex );
     b->b_conns = c;
-    ldap_pvt_thread_mutex_unlock( &b->b_lock );
+    ldap_pvt_thread_mutex_unlock( &b->b_mutex );
 }
 
 Connection *
@@ -84,15 +84,15 @@ backend_select( Operation *op )
     LDAP_STAILQ_FOREACH ( b, &backend, b_next ) {
         Connection *c;
 
-        ldap_pvt_thread_mutex_lock( &b->b_lock );
+        ldap_pvt_thread_mutex_lock( &b->b_mutex );
         c = b->b_conns;
         ldap_pvt_thread_mutex_lock( &c->c_mutex );
         if ( c->c_state == SLAP_C_READY && !c->c_pendingber ) {
-            ldap_pvt_thread_mutex_unlock( &b->b_lock );
+            ldap_pvt_thread_mutex_unlock( &b->b_mutex );
             return b->b_conns;
         }
         ldap_pvt_thread_mutex_unlock( &c->c_mutex );
-        ldap_pvt_thread_mutex_unlock( &b->b_lock );
+        ldap_pvt_thread_mutex_unlock( &b->b_mutex );
     }
 
     return NULL;

diff --git a/servers/lloadd/config.c b/servers/lloadd/config.c
index 405f311b365d079a10b2a2acfcd014d4f3070cc5..77c897741f2ac661043c09d9a391d344b27dce8d 100644 (file)
--- a/servers/lloadd/config.c
+++ b/servers/lloadd/config.c
@@ -533,7 +533,7 @@ config_backend( ConfigArgs *c )
         b->b_host = ch_strdup( lud->lud_host );
     }
 
-    ldap_pvt_thread_mutex_init( &b->b_lock );
+    ldap_pvt_thread_mutex_init( &b->b_mutex );
 
 done:
     ldap_free_urldesc( lud );

diff --git a/servers/lloadd/slap.h b/servers/lloadd/slap.h
index 5925f55edc268c82fcd5e4c74202261c4a1cc006..d193a71a29e8d361208c3115e2814862359eee4d 100644 (file)
--- a/servers/lloadd/slap.h
+++ b/servers/lloadd/slap.h
@@ -231,7 +231,7 @@ enum lload_tls_type {
 
 struct Backend {
     struct slap_bindconf b_bindconf;
-    ldap_pvt_thread_mutex_t b_lock;
+    ldap_pvt_thread_mutex_t b_mutex;
 
     int b_proto, b_port;
     enum lload_tls_type b_tls;

diff --git a/servers/lloadd/upstream.c b/servers/lloadd/upstream.c
index e72465edd281e431a458d5610055e8da468ab016..a95a47e637cf18c5d7bd0e821cd3d7c6701993cf 100644 (file)
--- a/servers/lloadd/upstream.c
+++ b/servers/lloadd/upstream.c
@@ -331,7 +331,7 @@ upstream_bind( void *ctx, void *arg )
 
     ldap_pvt_thread_mutex_unlock( &c->c_mutex );
 
-    ldap_pvt_thread_mutex_lock( &b->b_lock );
+    ldap_pvt_thread_mutex_lock( &b->b_mutex );
     if ( b->b_bindconf.sb_method == LDAP_AUTH_SIMPLE ) {
         /* simple bind */
         rc = ber_printf( ber, "{it{iOtON}}",
@@ -355,7 +355,7 @@ upstream_bind( void *ctx, void *arg )
         }
 #endif /* HAVE_CYRUS_SASL */
     }
-    ldap_pvt_thread_mutex_unlock( &b->b_lock );
+    ldap_pvt_thread_mutex_unlock( &b->b_mutex );
 
     ldap_pvt_thread_mutex_lock( &c->c_io_mutex );
     c->c_pendingber = ber;
@@ -417,13 +417,13 @@ upstream_destroy( Connection *c )
     c->c_state = SLAP_C_INVALID;
     ldap_pvt_thread_mutex_unlock( &c->c_mutex );
 
-    ldap_pvt_thread_mutex_lock( &b->b_lock );
+    ldap_pvt_thread_mutex_lock( &b->b_mutex );
     if ( !(b->b_conns == c) ) {
-        ldap_pvt_thread_mutex_unlock( &b->b_lock );
+        ldap_pvt_thread_mutex_unlock( &b->b_mutex );
         return;
     }
     b->b_conns = NULL;
-    ldap_pvt_thread_mutex_unlock( &b->b_lock );
+    ldap_pvt_thread_mutex_unlock( &b->b_mutex );
 
     ldap_pvt_thread_pool_submit( &connection_pool, backend_connect, b );