diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-17 12:31:49 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-17 12:31:49 +1030 |
| commit | b754f61d235bdc3e410b60014d6be4072645e16f (patch) | |
| tree | 12849992718ca8e4c8934dd5f4d79c587b5ffd55 | |
| parent | 5d9de604d92d227899e9b861c6beafb2e4fa61e0 (diff) | |
| download | samba-b754f61d235bdc3e410b60014d6be4072645e16f.tar.gz samba-b754f61d235bdc3e410b60014d6be4072645e16f.tar.bz2 samba-b754f61d235bdc3e410b60014d6be4072645e16f.zip | |
tdb: don't suppress the transaction lock because of the allrecord lock.
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>
| -rw-r--r-- | lib/tdb/common/lock.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c index e3759a3f8d..66cfcbdeea 100644 --- a/lib/tdb/common/lock.c +++ b/lib/tdb/common/lock.c @@ -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; |