summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-04-11 05:27:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:18 -0500
commitf61cb379895bbd7818889c3d4c8719938d2a48a4 (patch)
tree7ed24d2c425974c96546be8246b29b26a48da169
parent62683646dc41cac4956c7df622f37c816521051c (diff)
downloadsamba-f61cb379895bbd7818889c3d4c8719938d2a48a4.tar.gz
samba-f61cb379895bbd7818889c3d4c8719938d2a48a4.tar.bz2
samba-f61cb379895bbd7818889c3d4c8719938d2a48a4.zip
r22164: Fix missing lock count release in transaction cancel.
Found by Taj Khattra <taj.khattra@gmail.com>. Jeremy. (This used to be commit a014a6c30d1e0d75a1a49fdd61bad8cf4cc90327)
-rw-r--r--source3/tdb/common/transaction.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/tdb/common/transaction.c b/source3/tdb/common/transaction.c
index eb296206f9..640cd5014d 100644
--- a/source3/tdb/common/transaction.c
+++ b/source3/tdb/common/transaction.c
@@ -523,6 +523,8 @@ int tdb_transaction_cancel(struct tdb_context *tdb)
F_UNLCK,F_SETLKW, 0, 1);
}
tdb->num_locks = 0;
+ tdb->num_lockrecs = 0;
+ SAFE_FREE(tdb->lockrecs);
}
/* restore the normal io methods */