sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

tdb: don't suppress the transaction lock because of the allrecord lock.

Browse Source 
tdb_transaction_lock() and tdb_transaction_unlock() do nothing if we
hold the allrecord lock.  However, the two locks don't overlap, so
this is wrong.

This simplification makes the transaction lock a straight-forward nested
lock.

There are two callers for these functions:
1) The transaction code, which already makes sure the allrecord_lock
   isn't held.
2) The traverse code, which wants to stop transactions whether it has the
   allrecord lock or not.  There have been deadlocks here before, however
   this should not bring them back (I hope!)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2010-02-17 12:31:49 +10:30
parent 5d9de604d9
commit b754f61d23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tdb/common/lock.c
View File

@ -420,9 +420,6 @@ int tdb_unlock(struct tdb_context *tdb, int list, int ltype)
*/
int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
{
if (tdb->allrecord_lock.count) {
return 0;
}
if (tdb->transaction_lock_count > 0) {
tdb->transaction_lock_count++;
return 0;
@ -443,9 +440,6 @@ int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
int tdb_transaction_unlock(struct tdb_context *tdb, int ltype)
{
int ret;
if (tdb->allrecord_lock.count) {
return 0;
}
if (tdb->transaction_lock_count > 1) {
tdb->transaction_lock_count--;
return 0;