diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:58:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:58:13 +0930 |
| commit | 5d9dd8d541a761e0af2c8d50ee55485f2cef3e01 (patch) | |
| tree | 292d92329072b4e5e4e091544ca499903bcba276 /lib/tdb2/transaction.c | |
| parent | 014ca657e600ee2b3b4dc9d2ef482d050cd0917d (diff) | |
| download | samba-5d9dd8d541a761e0af2c8d50ee55485f2cef3e01.tar.gz samba-5d9dd8d541a761e0af2c8d50ee55485f2cef3e01.tar.bz2 samba-5d9dd8d541a761e0af2c8d50ee55485f2cef3e01.zip | |
tdb2: unify tdb1_transaction_start etc. into tdb_transaction_start.
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 6bc8ea012391198bc3898ae2937558b60dd55906)
Diffstat (limited to 'lib/tdb2/transaction.c')
| -rw-r--r-- | lib/tdb2/transaction.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/lib/tdb2/transaction.c b/lib/tdb2/transaction.c index a5f3c543e8..eab00e0937 100644 --- a/lib/tdb2/transaction.c +++ b/lib/tdb2/transaction.c @@ -521,6 +521,12 @@ 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) { @@ -617,6 +623,10 @@ fail_allrecord_lock: */ 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); } @@ -1052,6 +1062,11 @@ static enum TDB_ERROR _tdb_transaction_prepare_commit(struct tdb_context *tdb) */ 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_transaction_prepare_commit(tdb); } @@ -1064,6 +1079,12 @@ 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, |