tdb2: rework lock.c static functions to return enum TDB_ERROR.

[ccan] / ccan / tdb2 / transaction.c

diff --git a/ccan/tdb2/transaction.c b/ccan/tdb2/transaction.c
index 5772fb44028cb832c041b233b24548e7f352f644..6b2954dbe64de152b6c9ae28a4fdd2688ead18b9 100644 (file)
--- a/ccan/tdb2/transaction.c
+++ b/ccan/tdb2/transaction.c
@@ -509,7 +509,7 @@ int tdb_transaction_start(struct tdb_context *tdb)
 
        /* cope with nested tdb_transaction_start() calls */
        if (tdb->transaction != NULL) {
-               tdb_logerr(tdb, TDB_ERR_NESTING, TDB_LOG_USE_ERROR,
+               tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_USE_ERROR,
                           "tdb_transaction_start:"
                           " already inside transaction");
                return -1;
@@ -965,15 +965,6 @@ int tdb_transaction_commit(struct tdb_context *tdb)
 
        tdb_trace(tdb, "tdb_transaction_commit");
 
-       if (tdb->transaction->transaction_error) {
-               tdb_transaction_cancel(tdb);
-               tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
-                          "tdb_transaction_commit:"
-                          " transaction error pending");
-               return -1;
-       }
-
-
        if (tdb->transaction->nesting != 0) {
                tdb->transaction->nesting--;
                return 0;