Just use read locks on the entry_db_lock

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index c6d48112ce7cbf8a8878046d19ef3c47c27dd34f..9854a5656eb81e6932987ba77fa9a524cd6d8d80 100644 (file)
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -843,7 +843,7 @@ load1:
                                bdb_cache_entryinfo_unlock( *eip );
                                islocked = 0;
                        }
-                       rc = bdb_cache_entry_db_lock( bdb, locker, *eip, load, 0, lock );
+                       rc = bdb_cache_entry_db_lock( bdb, locker, *eip, 0, 0, lock );
                        if ( (*eip)->bei_state & CACHE_ENTRY_DELETED ) {
                                rc = DB_NOTFOUND;
                                bdb_cache_entry_db_unlock( bdb, lock );
@@ -864,11 +864,7 @@ load1:
                                                ep = NULL;
                                                bdb_cache_lru_link( bdb, *eip );
                                        }
-                                       if ( rc == 0 ) {
-                                               /* If we succeeded, downgrade back to a readlock. */
-                                               rc = bdb_cache_entry_db_relock( bdb, locker,
-                                                       *eip, 0, 0, lock );
-                                       } else {
+                                       if ( rc ) {
                                                /* Otherwise, release the lock. */
                                                bdb_cache_entry_db_unlock( bdb, lock );
                                        }