git.samba.org
/
ira
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tdb: don't suppress the transaction lock because of the allrecord lock.
[ira/wip.git]
/
lib
/
tdb
/
common
/
lock.c
diff --git
a/lib/tdb/common/lock.c
b/lib/tdb/common/lock.c
index e3759a3f8dddd38465fa4da4fdaea992cecb264c..66cfcbdeea6eab9cd943f7b18a9dd8f66e4c9f8e 100644
(file)
--- 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)
{
*/
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;
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;
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;
if (tdb->transaction_lock_count > 1) {
tdb->transaction_lock_count--;
return 0;