upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

During cleanup always unlock root_mutex if rootlock is true

Browse source 
(don't make it conditional on p == NULL)
This commit is contained in:
Kurt Zeilenga 1999-01-21 22:20:03 +00:00
parent 695ad44694
commit 6edeeeffd4
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/back-ldbm/add.c
View file

@ -119,8 +119,8 @@ ldbm_back_add(
* and release the add lock.
*/
pthread_mutex_lock(&li->li_root_mutex);
rootlock = 1;
pthread_mutex_unlock(&li->li_add_mutex);
rootlock=1;
}
/*
@ -134,7 +134,8 @@ ldbm_back_add(
if( p != NULL) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
} else if ( rootlock ) {
}
if ( rootlock ) {
/* release root lock */
pthread_mutex_unlock(&li->li_root_mutex);
}
@ -208,8 +209,9 @@ return_results:;
if (p != NULL) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
}
} else if ( rootlock ) {
if ( rootlock ) {
/* release root lock */
pthread_mutex_unlock(&li->li_root_mutex);
}

3
servers/slapd/back-ldbm/delete.c
View file

@ -141,8 +141,9 @@ return_results:;
if( p != NULL ) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
}
} else if ( rootlock ) {
if ( rootlock ) {
/* release root lock */
pthread_mutex_unlock(&li->li_root_mutex);
}

5
servers/slapd/back-ldbm/modify.c
View file

@ -32,6 +32,7 @@ ldbm_back_modify(
Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0);
/* acquire and lock entry */
if ( (e = dn2entry_w( be, dn, &matched )) == NULL ) {
send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, matched,
NULL );
@ -41,10 +42,6 @@ ldbm_back_modify(
return( -1 );
}
/* check for deleted */
/* lock entry */
if ( (err = acl_check_modlist( be, conn, op, e, modlist )) != LDAP_SUCCESS ) {
send_ldap_result( conn, op, err, NULL, NULL );
goto error_return;

3
servers/slapd/back-ldbm/modrdn.c
View file

@ -176,8 +176,9 @@ return_results:
if( p != NULL ) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
}
} else if ( rootlock ) {
if ( rootlock ) {
/* release root writer lock */
pthread_mutex_unlock(&li->li_root_mutex);
}