Use refcnt instead of keeping entry locked in Add response

[openldap] / servers / slapd / back-bdb / add.c

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index d91ee1ada820e8d5ecfdb6d4b87be69233272a84..9811177c1219dba02d42603acebdb025e6bc621d 100644 (file)
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -32,7 +32,7 @@ bdb_add(Operation *op, SlapReply *rs )
        size_t textlen = sizeof textbuf;
        AttributeDescription *children = slap_schema.si_ad_children;
        AttributeDescription *entry = slap_schema.si_ad_entry;
-       DB_TXN          *ltid = NULL, *lt2, *rtxn;
+       DB_TXN          *ltid = NULL, *lt2;
        ID eid = NOID;
        struct bdb_op_info opinfo = {{{ 0 }}};
        int subentry;
@@ -121,9 +121,6 @@ txnReturn:
 
        subentry = is_entry_subentry( op->ora_e );
 
-       /* Get our reader TXN */
-       rs->sr_err = bdb_reader_get( op, bdb->bi_dbenv, &rtxn );
-
        if( 0 ) {
 retry: /* transaction retry */
                if( p ) {
@@ -480,8 +477,7 @@ retry:      /* transaction retry */
                        nrdn = op->ora_e->e_nname;
                }
 
-               /* Use the reader txn here, outside the add txn */
-               bdb_cache_add( bdb, ei, op->ora_e, &nrdn, rtxn, &lock );
+               bdb_cache_add( bdb, ei, op->ora_e, &nrdn, ltid, &lock );
 
                if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
                        rs->sr_text = "txn_commit failed";
@@ -527,7 +523,7 @@ return_results:
                 * Possibly a callback may have mucked with it, although
                 * in general callbacks should treat the entry as read-only.
                 */
-               bdb_cache_return_entry_r( bdb, oe, &lock );
+               bdb_cache_deref( oe->e_private );
                if ( op->ora_e == oe )
                        op->ora_e = NULL;