mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-28 02:29:34 -05:00
Revert prev commit
This commit is contained in:
parent
57c5bbf7e4
commit
fb583c3071
1 changed files with 7 additions and 3 deletions
|
|
@ -837,7 +837,7 @@ load1:
|
|||
bdb_cache_entryinfo_unlock( *eip );
|
||||
islocked = 0;
|
||||
}
|
||||
rc = bdb_cache_entry_db_lock( bdb, locker, *eip, 0, 0, lock );
|
||||
rc = bdb_cache_entry_db_lock( bdb, locker, *eip, load, 0, lock );
|
||||
if ( (*eip)->bei_state & CACHE_ENTRY_DELETED ) {
|
||||
rc = DB_NOTFOUND;
|
||||
bdb_cache_entry_db_unlock( bdb, lock );
|
||||
|
|
@ -858,8 +858,12 @@ load1:
|
|||
ep = NULL;
|
||||
bdb_cache_lru_link( bdb, *eip );
|
||||
}
|
||||
if ( rc ) {
|
||||
/* On error, release the lock. */
|
||||
if ( rc == 0 ) {
|
||||
/* If we succeeded, downgrade back to a readlock. */
|
||||
rc = bdb_cache_entry_db_relock( bdb, locker,
|
||||
*eip, 0, 0, lock );
|
||||
} else {
|
||||
/* Otherwise, release the lock. */
|
||||
bdb_cache_entry_db_unlock( bdb, lock );
|
||||
}
|
||||
} else if ( !(*eip)->bei_e ) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue