[Fedora-directory-commits] ldapserver/ldap/servers/slapd mapping_tree.c, 1.10, 1.11

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16755/ldapserver/ldap/servers/slapd

Modified Files:
	mapping_tree.c 
Log Message:
Resolves: bug 301811
Bug Description: reliab15: slapd hangs on goblin5
Reviewed by: nhosoi (Thanks!)
Fix Description: We are calling the mtn_lock() twice in the same thread.  The proposed fix
is to move the mtn_lock() so this doesn't happen.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: mapping_tree.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/mapping_tree.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mapping_tree.c	23 Aug 2007 20:52:13 -0000	1.10
+++ mapping_tree.c	25 Sep 2007 22:12:26 -0000	1.11
@@ -2237,6 +2237,7 @@
     int index;
     Slapi_Operation *op;
     int ret;
+    int need_unlock = 0;
     
     if(mapping_tree_freed){
         return LDAP_OPERATIONS_ERROR;
@@ -2246,14 +2247,17 @@
     slapi_pblock_get(pb, SLAPI_OPERATION, &op);
     target_sdn = operation_get_target_spec (op);
 
-    mtn_lock();
-
     * referral = NULL;
     ret = slapi_mapping_tree_select(pb, be, referral, errorbuf); 
     if (ret)
         goto unlock_and_return;
 
     slapi_sdn_init_dn_byref(&dn_newdn,newdn);
+
+    /* acquire lock now, after slapi_mapping_tree_select() which also locks,
+       because we are accessing mt internals */
+    mtn_lock();
+    need_unlock = 1; /* we have now acquired the lock */
     target_node = slapi_get_mapping_tree_node_by_dn(&dn_newdn);
     if (target_node == NULL)
         target_node = mapping_tree_root;
@@ -2270,6 +2274,11 @@
     }
 
 unlock_and_return:
+    /* if slapi_mapping_tree_select failed, we won't have the lock */
+    if (need_unlock) {
+        mtn_unlock();
+    }
+
     slapi_sdn_done(&dn_newdn);
 
     if (new_be)
@@ -2291,8 +2300,6 @@
             *referral = NULL;
         }
     }
-    
-    mtn_unlock();
 
     return ret;
 }