summaryrefslogtreecommitdiff
path: root/lib/tdb2/transaction.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-18 22:30:25 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-06-19 05:38:05 +0200
commitcab6e116786641e28747de3f70c8cd89ba17673f (patch)
treee41622bfd16ed94a6bb67a91a409ac970a22c533 /lib/tdb2/transaction.c
parent6244f668a34279e6da62213333dfb32c3ccdb17d (diff)
downloadsamba-cab6e116786641e28747de3f70c8cd89ba17673f.tar.gz
samba-cab6e116786641e28747de3f70c8cd89ba17673f.tar.bz2
samba-cab6e116786641e28747de3f70c8cd89ba17673f.zip
TDB2: remove TDB1 compatibility.
This rips out all the TDB1 compatibility from tdb2. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/transaction.c')
-rw-r--r--lib/tdb2/transaction.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/lib/tdb2/transaction.c b/lib/tdb2/transaction.c
index f6d75572a0..cd6d42a6ec 100644
--- a/lib/tdb2/transaction.c
+++ b/lib/tdb2/transaction.c
@@ -521,12 +521,6 @@ _PUBLIC_ enum TDB_ERROR tdb_transaction_start(struct tdb_context *tdb)
{
enum TDB_ERROR ecode;
- if (tdb->flags & TDB_VERSION1) {
- if (tdb1_transaction_start(tdb) == -1)
- return tdb->last_error;
- return TDB_SUCCESS;
- }
-
tdb->stats.transactions++;
/* some sanity checks */
if (tdb->flags & TDB_INTERNAL) {
@@ -623,10 +617,6 @@ fail_allrecord_lock:
*/
_PUBLIC_ void tdb_transaction_cancel(struct tdb_context *tdb)
{
- if (tdb->flags & TDB_VERSION1) {
- tdb1_transaction_cancel(tdb);
- return;
- }
tdb->stats.transaction_cancel++;
_tdb_transaction_cancel(tdb);
}
@@ -1067,11 +1057,6 @@ static enum TDB_ERROR _tdb_transaction_prepare_commit(struct tdb_context *tdb)
*/
_PUBLIC_ enum TDB_ERROR tdb_transaction_prepare_commit(struct tdb_context *tdb)
{
- if (tdb->flags & TDB_VERSION1) {
- if (tdb1_transaction_prepare_commit(tdb) == -1)
- return tdb->last_error;
- return TDB_SUCCESS;
- }
return tdb->last_error = _tdb_transaction_prepare_commit(tdb);
}
@@ -1084,12 +1069,6 @@ _PUBLIC_ enum TDB_ERROR tdb_transaction_commit(struct tdb_context *tdb)
int i;
enum TDB_ERROR ecode;
- if (tdb->flags & TDB_VERSION1) {
- if (tdb1_transaction_commit(tdb) == -1)
- return tdb->last_error;
- return TDB_SUCCESS;
- }
-
if (tdb->tdb2.transaction == NULL) {
return tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
TDB_LOG_USE_ERROR,