minor cleanup

[openldap] / servers / slapd / back-meta / unbind.c

diff --git a/servers/slapd/back-meta/unbind.c b/servers/slapd/back-meta/unbind.c
index 5211a9dae32b5576ddb6580ad50c1dbf443ca696..c9aea2de998878179175ae1d968b7db9cca6c7f7 100644 (file)
--- a/servers/slapd/back-meta/unbind.c
+++ b/servers/slapd/back-meta/unbind.c
@@ -40,48 +40,38 @@ meta_back_conn_destroy(
        metainfo_t      *mi = ( metainfo_t * )be->be_private;
        metaconn_t      *mc,
                        mc_curr = { 0 };
+       int             i;
+
 
        Debug( LDAP_DEBUG_TRACE,
-               "=>meta_back_conn_destroy: fetching conn %ld\n",
-               conn->c_connid, 0, 0 );
+               "=>meta_back_conn_destroy: fetching conn=%ld DN=\"%s\"\n",
+               conn->c_connid,
+               BER_BVISNULL( &conn->c_ndn ) ? "" : conn->c_ndn.bv_val, 0 );
        
        mc_curr.mc_conn = conn;
+       mc_curr.mc_local_ndn = conn->c_ndn;
        
-retry_lock:;
-       switch ( ldap_pvt_thread_mutex_trylock( &mi->mi_conn_mutex ) ) {
-       case LDAP_PVT_THREAD_EBUSY:
-       default:
-               ldap_pvt_thread_yield();
-               goto retry_lock;
-
-       case 0:
-               break;
-       }
-       mc = avl_delete( &mi->mi_conntree, ( caddr_t )&mc_curr,
+       ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+       mc = avl_delete( &mi->mi_conninfo.lai_tree, ( caddr_t )&mc_curr,
                        meta_back_conn_cmp );
-       ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex );
+       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
 
        if ( mc ) {
-               int     i;
-
                Debug( LDAP_DEBUG_TRACE,
                        "=>meta_back_conn_destroy: destroying conn %ld\n",
-                       mc->mc_conn->c_connid, 0, 0 );
+                       LDAP_BACK_PCONN_ID( mc->mc_conn ), 0, 0 );
                
-               /*
-                * Cleanup rewrite session
-                */
-               for ( i = 0; i < mi->mi_ntargets; ++i ) {
-                       rewrite_session_delete( mi->mi_targets[ i ].mt_rwmap.rwm_rw, conn );
+               assert( mc->mc_refcnt == 0 );
 
-                       if ( mc->mc_conns[ i ].msc_ld != NULL ) {
-                               meta_clear_one_candidate( &mc->mc_conns[ i ] );
-                       }
-               }
                meta_back_conn_free( mc );
        }
 
-       /* no response to unbind */
+       /*
+        * Cleanup rewrite session
+        */
+       for ( i = 0; i < mi->mi_ntargets; ++i ) {
+               rewrite_session_delete( mi->mi_targets[ i ].mt_rwmap.rwm_rw, conn );
+       }
 
        return 0;
 }