More places where LOCK_ID() calls need to be checked.

[openldap] / servers / slapd / back-ldbm / delete.c

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index adb1ff6b724bf5b4d7f1cd614507185ca94a3630..d33e957f678f6dd3d1457399c586200fe8060e6a 100644 (file)
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -29,26 +29,27 @@ ldbm_back_delete(
        Entry   *matched;
        struct berval   pdn;
        Entry   *e, *p = NULL;
-       int rootlock = 0;
        int     rc = -1;
        int             manageDSAit = get_manageDSAit( op );
        AttributeDescription *children = slap_schema.si_ad_children;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-               "ldbm_back_delete: %s\n", dn->bv_val ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_delete: %s\n", dn->bv_val, 0, 0 );
 #else
        Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn->bv_val, 0, 0);
 #endif
 
+       /* grab giant lock for writing */
+       ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
+
        /* get entry with writer lock */
        if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
                char *matched_dn = NULL;
                BerVarray refs;
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "ldbm_back_delete: no such object %s\n", dn->bv_val ));
+               LDAP_LOG( BACK_LDBM, INFO, 
+                       "ldbm_back_delete: no such object %s\n", dn->bv_val, 0, 0 );
 #else
                Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n",
                        dn->bv_val, 0, 0);
@@ -66,6 +67,8 @@ ldbm_back_delete(
                                NULL, dn, LDAP_SCOPE_DEFAULT );
                }
 
+               ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
+
                send_ldap_result( conn, op, LDAP_REFERRAL,
                        matched_dn, NULL, refs, NULL );
 
@@ -82,9 +85,8 @@ ldbm_back_delete(
                        conn, op, e );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "ldbm_back_delete: entry (%s) is a referral.\n",
-                       e->e_dn ));
+               LDAP_LOG( BACK_LDBM, INFO, 
+                       "ldbm_back_delete: entry (%s) is a referral.\n", e->e_dn, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                    0, 0 );
@@ -102,8 +104,8 @@ ldbm_back_delete(
 
        if ( has_children( be, e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "ldbm_back_delete: (%s) is a non-leaf node.\n", dn->bv_val ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                          "ldbm_back_delete: (%s) is a non-leaf node.\n", dn->bv_val, 0,0);
 #else
                Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
                        dn->bv_val, 0, 0);
@@ -115,12 +117,12 @@ ldbm_back_delete(
        }
 
        /* delete from parent's id2children entry */
-       if( !be_issuffix( be, &e->e_nname ) && dnParent( &e->e_nname, &pdn ) == LDAP_SUCCESS
-               && pdn.bv_len ) {
+       if( !be_issuffix( be, &e->e_nname ) && (dnParent( &e->e_nname, &pdn ),
+               pdn.bv_len) ) {
                if( (p = dn2entry_w( be, &pdn, NULL )) == NULL) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                               "ldbm_back_delete: parent of (%s) does not exist\n", dn ));
+                       LDAP_LOG( BACK_LDBM, ERR, 
+                               "ldbm_back_delete: parent of (%s) does not exist\n", dn, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- ldbm_back_delete: parent does not exist\n",
@@ -134,12 +136,12 @@ ldbm_back_delete(
 
                /* check parent for "children" acl */
                if ( ! access_allowed( be, conn, op, p,
-                       children, NULL, ACL_WRITE ) )
+                       children, NULL, ACL_WRITE, NULL ) )
                {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                               "ldbm_back_delete: no access to parent of (%s)\n",
-                               dn->bv_val ));
+                       LDAP_LOG( BACK_LDBM, ERR, 
+                               "ldbm_back_delete: no access to parent of (%s)\n", 
+                               dn->bv_val, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- ldbm_back_delete: no access to parent\n", 0,
@@ -158,15 +160,15 @@ ldbm_back_delete(
                                p = (Entry *)&slap_entry_root;
                                
                                rc = access_allowed( be, conn, op, p,
-                                       children, NULL, ACL_WRITE );
+                                       children, NULL, ACL_WRITE, NULL );
                                p = NULL;
                                                                
                                /* check parent for "children" acl */
                                if ( ! rc ) {
 #ifdef NEW_LOGGING
-                                       LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                                       LDAP_LOG( BACK_LDBM, ERR,
                                                "ldbm_back_delete: no access "
-                                               "to parent of ("")\n" ));
+                                               "to parent of ("")\n", 0, 0, 0 );
 #else
                                        Debug( LDAP_DEBUG_TRACE,
                                                "<=- ldbm_back_delete: no "
@@ -181,9 +183,9 @@ ldbm_back_delete(
 
                        } else {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                               LDAP_LOG( BACK_LDBM, ERR, 
                                        "ldbm_back_delete: (%s) has no "
-                                       "parent & not a root.\n", dn ));
+                                       "parent & not a root.\n", dn, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_TRACE,
                                        "<=- ldbm_back_delete: no parent & "
@@ -196,17 +198,13 @@ ldbm_back_delete(
                                goto return_results;
                        }
                }
-
-               ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
-               rootlock = 1;
        }
 
        /* delete from dn2id mapping */
        if ( dn2id_delete( be, &e->e_nname, e->e_id ) != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                       "ldbm_back_delete: (%s) operations error\n",
-                       dn->bv_val ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                       "ldbm_back_delete: (%s) operations error\n", dn->bv_val, 0, 0 );
 #else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_back_delete: operations error %s\n",
@@ -221,9 +219,8 @@ ldbm_back_delete(
        /* delete from disk and cache */
        if ( id2entry_delete( be, e ) != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                       "ldbm_back_delete: (%s) operations error\n",
-                       dn->bv_val ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                       "ldbm_back_delete: (%s) operations error\n", dn->bv_val, 0, 0 );
 #else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_back_delete: operations error %s\n",
@@ -248,13 +245,10 @@ return_results:;
                cache_return_entry_w( &li->li_cache, p );
        }
 
-       if ( rootlock ) {
-               /* release root lock */
-               ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
-       }
-
        /* free entry and writer lock */
        cache_return_entry_w( &li->li_cache, e );
 
+       ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
+
        return rc;
 }